Added user model
Merge branch 'master' of https://github.com/tofo/sample_app