added logic signup and login
fixed merge conflicts