Updated the login page
Fixed merge conflict and added db to .gitignore