new project version
version: 1.0.0
version 1.0.0
Merge branch 'master' of https://github.com/johnchoi/zeyi

Conflicts:
	.gitignore