added progress-ii
Merge remote-tracking branch 'upstream/master'
added checking to the login
fixed merge
login now works
Merge pull request #37 from mattinm/master

Login works