Merge branch 'roger'

Conflicts:
	class_schedule.txt