Added Roger's changes
Change prep period
Merge remote-tracking branch 'origin/roger-branch'
Merge branch 'master' of https://github.com/rogerjaffe/GithubIntro

Conflicts:
	class_schedule.txt