Merge branch '08-config.asc' of https://github.com/spacewander/progit2-zh into spacewander-08-config.asc

Conflicts:
	status.json

Author: networm