Merge remote-tracking branch 'origin/master'

public/404.html

@@ -34,8 +34,11 @@
         </ul>
     </div>
     <div class="main">
-        <div id="content" class="container">
-            
+        <div id="content" class="error container text-center">
+            <h1 id="error-code">404</h1>
+            <img id="dcimg" src="./img/DolphinCroissant.png" />
+            <p style="padding-top: 25px;">Yeah, that page doesn't exist.</p>
+            <p>Maybe if you weren't so adventurous you'd avoid screens like this :)</p>
         </div>
     </div>
 </body>

public/style.css

@@ -26,16 +26,25 @@
     height: 60px;
 }
 #error-code {
-    background-color: rgb(208, 208, 208);
+    font-family: Comfortaa;
+    font-size: 200px;
+    color: rgb(208, 208, 208);
 }
 #navigation {
     width: 70%;
     padding-right: 20px !important;
 }
+.error {
+    color: rgb(208, 208, 208);
+}
+#dcimg {
+    width: 300px;
+}
 .big-title {
     font-family: Comfortaa;
     font-weight: bold;
     font-size: 60px;
+    text-wrap: avoid;
 }
 .m-title {
     font-family: Comfortaa;