More very minor changes.
Merge branch 'master' of https://github.com/nobozo/progit2

Conflicts:
	book/01-introduction/sections/about-version-control.asc