added user model
Merge branch 'master' of github.com:brettshollenberger/angular-rails