User type changed
Merge branch 'master' of https://github.com/r-bergundy/Group-Project
Validation works. Bugs fixed