代码修改
代码修改
Merge branch 'master' into dev

Conflicts:
	README.md
移除废弃代码
first commit
Merge pull request #1 from vito16/dev

Dev