added login
Merge branch 'master' into jason
added login
Merge pull request #2 from gdomingu/jason

Jason