first commit
second commit
second commit
update summary
update outline
update outline
update outline
update outline
update outline
spaces in set up
pre tags in intro
edits to Branching section
typo
test edit
test edit on branch
trying to create a conflict
Merge branch 'master' into changes

Conflicts:
	copy.md
edits
test
test2