大致完成了git专题的部分
Merge branch 'master' of github.com:homeway/homeway.github.com

Conflicts:
	tutorial/git.md