commit 1
Merge branch 'master' of https://github.com/rogerjaffe/GithubIntro

Conflicts:
	class_schedule.txt