work on the login and register pages
merge conflict