signup and login kind of working
fixed dumb merge conflicts