Changing the register user function to be able to add an instructor or student
merge
Merge branch 'master' into zdwolfe
New everything