Revert "Merge branch 'Emmett' of https://github.com/mcb226/TeacherProject into Emmett"

This reverts commit 663430ffb9a2b87e69f7dd68dc2071b25741d6ca, reversing
changes made to 16b950654bdc375e67f5b698c4d88e97ac131d50.
emmett's stuff