User controller
Merge pull request #1 from DrakeW/user-controller

User controller