bbbbbbb
Merge branch 'master' of https://github.com/liuweixing/vcm

Conflicts:
	cc.txt