functions for changed login/signup api
fix indentation
handle merge conflict in main.poy
Merge pull request #2 from JessieSalas/vincent/changed_login

functions for changed login/signup api