working on login
Merge pull request #16 from JoyP/login

working on login