adding login and signup
merge login and signup