blah
Merge remote-tracking branch 'upstream/master'
UserManager
Merge pull request #51 from daverboy23/master

UserManager