this is a commit
Merge remote-tracking branch 'upstream/master'
new merge
more documenting
did some getters that were forgotten
fixed some getters
Merge pull request #14 from b-dub25/master

getters
fixed query in getting user info
added some simplified methods
added grant methods
added grant methods
Merge pull request #15 from b-dub25/master

getters
updated
Added password recovery functionality
fixes
fixes
Set recovery token to NULL after sucessful password recovery
syntax fixes and updates
missing semicolon
fixed some return statements