second commit
Merge branch 'master' of github.com:Kaitan/Gongshe

Conflicts:
	README.md