adding changes to user model
Merge branch 'master' of https://github.com/Tyler-Kujawa/IS_376
users controller updated