Login and sign up are working
Merge