working on mobile login logic
Fixed merge conflicts
Merge pull request #35 from ieatkimchi/mobile_login

working on mobile login logic