调整项目结构
调整结构
Merge branch 'master' of github.com:fuzhongchen/e6soft

Conflicts:
	README.md