Updating user controller
Merge pull request #46 from brandonmanson/user_controller

Updating user controller