Some login changes
Merge branch 'master' of https://github.com/NamiKuro/2014NYUHacks