Merge branch 'master' of https://github.com/buyongji/WorkFlow

Conflicts:
	README.md
test
需要
Merge branch 'master' of https://github.com/buyongji/WorkFlow