fixed merge conflict for javascript branch

src/main/webapp/index.html

@@ -15,7 +15,7 @@
         </div>
         <form class="main" id="loginForm" onsubmit="login(event)">
             <input class="loginInput" placeholder="Brukernavn..." id="username" required pattern="([\w]+)">
-            <input type="password" placeholder="Password..." id="password" required pattern="([\w]+)">
+            <input type="password" class="loginInput" placeholder="Password..." id="password" required pattern="([\w]+)">
             <button class="loginBtn">Logg inn</button>
         </form>
     </div>

src/main/webapp/js/index.js

@@ -16,6 +16,7 @@ function login(event){
     event.preventDefault();
     let user = {
         "username": document.getElementById('username').value,
+        "password": document.getElementById('password').value
     };
 
     fetch('../api/user', {