Merge branch 'master' into adam-branch

Conflicts:
	class_schedule.txt
Revert "Merge branch 'master' into adam-branch"

This reverts commit 83b01d400a323cdd2a66f14dfd7a6851f0de0cbf.
Remove the file to bring it from master again