commit before taking on all merge conflicts

Author: SterlingChin

src/assets/imgs/asset_30.png

@@ -17,9 +17,9 @@
     </div>
     <div class="top-menu">
       <ul class='ul-top'>
-        <li class='li65'>1</li>
-        <li class='li65'>2</li>
-        <li class='li170'>3</li>
+        <li><div class='li65'><img src='./assets/imgs/asset_30.png' class='li65-img'></div></li>
+        <li><div class='li65'><img src='./assets/imgs/asset_31.png'class='li65-img'></div></li>
+        <li class='li170'><li>img</li><li>kyu</li><li>lvl</li></li>
       </ul>
     </div>
     <main>

src/assets/imgs/asset_31.png

@@ -92,12 +92,35 @@ height:35px;
 .ul-top {
     display: flex;
     flex-direction: row;
-    align-items: center;
 }
 .li65 {
     width: 65px;
 }
+.li65-img {
+    margin:auto;
+    vertical-align: center;
+    height: 25px;
+}
 
 .li170 {
     width: 170px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+}
+
+.li170-img {
+    vertical-align: center;
+}
+
+.li170-1 {
+
+}
+
+.li170-2 {
+
+}
+
+.li170-3 {
+
 }