Working on the users controller
Merge branch 'master' of https://github.com/dfudger/donateme