user can login
user can log in (again)
Merge pull request #1 from Ravenstine/login

Login