Merge branch 'develop'

Conflicts: js/const.js
vrabe · Nov 6, 2016 · 522f510 · 522f510
2 parents 783dd78 + b811a7b
commit 522f510
Show file tree

Hide file tree

Showing 17 changed files with 2,437 additions and 306 deletions.
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/main.css b/css/main.css
@@ -17,7 +17,8 @@
 		background-position: 50% 70%;
       }
 	  .body{
-		padding: 30px;	  
+		padding: 30px;
+		padding-top: 60px;
 	  }
 	  .nav{
 	    padding-bottom: 20px;