git test c
test git d
test git C
Merge branch 'master' of https://github.com/18301551026/oa.git

Conflicts:
	readme.txt
111
222
Merge branch 'master' of https://github.com/18301551026/oa.git

Conflicts:
	readme.txt
delete readme
test
Merge branch 'master' of https://github.com/18301551026/oa.git
test