create user login, signup and logout
solve minor merge conflict
Merge pull request #4 from leeju/Adam

Adam