Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
adds userobj to authcheck
Merge pull request #99 from bloodhawk/master

adds userobj to authcheck
fixing merge conflicts