polish
Merge branch 'master' of github.com:limijiaoyin/china-v

Conflicts:
	.gitignore