Merge branch 'ben-branch'

Conflicts:
	class_schedule.txt