Initial commit
Merge github.com:zhengjiezxxy/moonbay

Conflicts:
	.gitignore