Merge branch 'master' into joey-testing

2017-01-20 16:18:57 +01:00
parent 6ff70440e6 7e3648d36c
commit e456591db6
22 changed files with 548 additions and 224 deletions
--- a/website/views/login_head.php
+++ b/website/views/login_head.php
@@ -3,10 +3,11 @@
    <title>MyHyvesbook+</title>
    <link rel="stylesheet"
          type="text/css"
-          href="styles/main.css">
+          href="/styles/main.css">
    <link rel="stylesheet"
          type="text/css"
          href="styles/index.css">
    <script src="jqeury.js"></script>
    <script src="registerAndLogin.js"></script>
+
 </head>