updating to user model
Merge pull request #24 from jereln/user-views

updating to user model
fix merge conflicts