updated UserModel and test cases
Merge branch 'master' of https://github.com/hbrice/final_project_cis399