Updates to modify User
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1