好的
Merge branch 'master' of https://github.com/oneToMany/it.git

Conflicts:
	.gitignore
好的
测试是否能够练到github
hao
zcz
Merge branch 'master' of https://github.com/oneToMany/it.git

Conflicts:
	123.txt