Merge branch 'master' of github.com:merhoo/merhoo.github.io

Author: zesameri

css/secrets.css

@@ -1,32 +1,33 @@
 body {
   overflow: hidden;
   position: relative;
-  left: -100px;
-  top: -100px;
   background: #000;
+  margin: 0;
 }
 
 .row {
   display: flex;
-  margin-left: 1em;
-}
-.row:nth-child(2n) {
-  position: relative;
-  left: -75px;
 }
-
 svg {
   margin: 8px;
 }
 
 .cell:hover, .cell:visited, .cell:focus {
+<<<<<<< HEAD
   /* animation: loaderAnim 5s ease-in-out infinite normal forwards; */
+=======
+  animation: rotate 5s ease-in-out infinite normal forwards;
+>>>>>>> 96fb828ccb758a7ae33f0cedc2cd03aebf2ba725
   padding: 0;
   margin: 0;
 }
 
 
+<<<<<<< HEAD
 /* @keyframes loaderAnim {
+=======
+@keyframes rotate {
+>>>>>>> 96fb828ccb758a7ae33f0cedc2cd03aebf2ba725
   0% {
     transform:rotate(0deg);
   }