Teacher able to only view own subject
version control for Kris
Merge remote-tracking branch 'origin/master'