diff --git a/manage.py b/manage.py
old mode 100755
new mode 100644
diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css
index b65b4bc..c37c218 100644
--- a/pages/static/pages/css/styles.css
+++ b/pages/static/pages/css/styles.css
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 @import 'https://fonts.googleapis.com/css?family=Montserrat:300,400,500';
 @import 'https://fonts.googleapis.com/css?family=Josefin+Slab:700';
 @import 'https://fonts.googleapis.com/css?family=Arapey:400,600';
@@ -863,4 +864,24 @@ hr {
   padding-bottom: 27px;
 }
 
-/*# sourceMappingURL=css/index.css.map */
\ No newline at end of file
+/*# sourceMappingURL=css/index.css.map */
+html {
+    overflow-x: hidden;
+}
+
+nav {
+    transform: translateY(-70px);
+    z-index: 10;
+    animation: nav-slide 0.75s ease-in-out forwards;
+    animation-delay: 1s;
+}
+
+@keyframes nav-slide {
+    0% {
+         transform: translateY(-70px);
+    }
+
+    100% {
+         transform: translateY(0px);
+    }
+}