Init
Merge branch 'master' of github.com:alexzhxin/CmfDemo

Conflicts:
	LICENSE
	README.md