Changes to make final version
Merge branch 'master' of https://github.com/nobozo/progit

Conflicts:
	en/01-introduction/01-chapter1.markdown