login/out
Merge branch 'master' of https://github.com/morganpatz/proj1