add login logic
add login logic2
Merge pull request #98 from STerao/login_logic

Login logic