sfasdf
Merge branch 'chapter-three'

Conflicts:
	GitInPractice.asciidoc