Merge branch 'joey-testing' into 'master'

Fixed css and confirmation for logged in already

See merge request !96

website/public/styles/index.css

@@ -13,7 +13,7 @@ a.button {
 
 /* Body */
 body {
-    height: 900px;
+    height: 100%;
     background-color: #C8CABD;
     /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg);
     background-size: cover;
@@ -46,7 +46,7 @@ body {
 form {
     /*background-color: #a87a87;*/
     border-radius: 12px;
-    height: 80%;
+    height: 70%;
     margin: auto;
     width: 70%;
     overflow-y:auto;
@@ -159,7 +159,7 @@ label {
     background-repeat: repeat-x;
     background-attachment: fixed;*/
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
-    height: 550px;
+    height: 500px;
     margin: 34px auto;
     overflow-y: auto;
     padding: 20px;

website/views/login_head.php

@@ -7,6 +7,6 @@
     <link rel="stylesheet"
           type="text/css"
           href="styles/index.css">
-    <script src="jqeury.js"></script>
-    <script src="registerAndLogin.js"></script>
+    <script src="/js/jqeury.js"></script>
+    <script src="/js/registerAndLogin.js"></script>
 </head>