created User model
pulled new comment from cate
Merge branch 'master' into user_model
Merge pull request #1 from ricarora/user_model

User model