changes to User to incorporate UserType functionality, UserType now removed
Merge branch 'master' of github.com:cwelch7/3307A-work-assignments
auto-merge to allow push of new data