本地修改
修改了冲突，再次提交
Merge branch 'master' of https://github.com/yimun/GesInput

Conflicts:
	README.md