Merge branch 'emily-branch'

Conflicts:
	class_schedule.txt