Added the ability to have both Students and Professors, with access controls
Merge remote-tracking branch 'origin/master'
Conflict Fixes