Individual student view for instructor
Merge branch 'stats'
resolved conflicts