Merge branch 'master' of https://github.com/sandersk/progit2-zh into sandersk-master

Conflicts:
	book/A-git-in-other-environments/sections/visualstudio.asc

Author: networm