Merge

@@ -62,7 +62,6 @@
             <strong>
           <%= "로테이션 챔피언: "  %>
         </strong>
-<<<<<<< HEAD
           <% for (var i=0; i<c_rotation.length-1; i++){ %>
               <img src= <%=c_rotation[i]%> width=50, height=50>
               <% } %>
@@ -70,7 +69,6 @@
 
       <br></br>
 
-=======
         </div>
         <div class="center">
           <strong>
@@ -98,7 +96,6 @@
             <%}%>
       </strong>
       </div>
->>>>>>> master
       <% for (var i=0; i<c_id.length-1; i++){ %>
         <div class="champImage">
           <div class="center">