Began work on authentication code
fixed merge conflicts in login.html