again
Merge branch 'class-branch' of https://github.com/gwhuffmanfoss/gittutorial into class-branch

Conflicts:
	junk.html