Did some changes to student view #2 for presentation
Merge branch 'master' of https://github.com/Project-Phoenix/Website