完成度90
Merge branch 'master' of github.com:visonforcoding/jkwshk

Conflicts:
	README.md