roger 2
Merge branch 'master' into Roger-branch

Conflicts:
	class_schedule.txt