added user model
Merge branch 'master' of https://github.com/Brandon-Lyons/NSS-student-engagement-app
fixed gemfile