changed User to UserModel
Merge branch 'login.add.users'
Merge branch 'master' of https://github.com/KevinJia191/cs169Skeleton