got students displaying
Merge branch 'chris'