Merge branch 'master' into samsam
Merge branch 'master' into samsam
reinstated commented-out code for student pages
Merge pull request #82 from epoch/samsam

Proposed fix for broken students page