Merge branch 'master' of https://github.com/wuzhen0808/cyberow

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/wuzhen0808/cyberow