zx
Merge branch 'master' of https://github.com/bumaociyuan/plugins

Conflicts:
	README.md
Merge branch 'master' of github.com:bumaociyuan/plugins