Fix login. No longer have null pointer exception
Merge branch 'master' of https://github.com/nganthony/ece356