delete ccxc.txt
delete ccxc.txt
Merge branch 'master' of https://github.com/shixunshixun/test.git
test
delete 222
Merge branch 'v1.0-branch'

Conflicts:
	ccxc.txt