login works
Merge pull request #41 from ospreys-2014/user_branch

login works