updated user controller
Merge pull request #12 from henrytwang/update_user_controller

updated user controller