Combined log in and sign up
fixed merge