sign up and sign in working
fixed merge conflicts