UserModel.h is more complete (perhaps totally complete)
Merge branch 'master' of https://github.com/hayesbh/ICDL14_Teammates