fixed a few bugs in login
Merge branch 'master' of https://github.com/yohenakai/cse135.git