name field in User class
Merge branch 'master' of git@github.com:mparsha1/CS496TeamProject.git