1
测试
Merge branch 'master' of github.com:chuchangming/code

Conflicts:
	.gitignore