committing
Merge remote-tracking branch 'upstream/master'
Merge pull request #42 from daverboy23/master

User and UserManager