finished logged in
Merge branch 'master' into login
Merge pull request #2 from kil432/login

Login