translation of simplified chinese
Merge branch 'master' of github.com:gelosie/git-flow-cheatsheet

Conflicts:
	index.zh_CN.html