del readme
用master替换test2
恢复后修改测试
Merge remote-tracking branch 'origin/test2'

Conflicts:
	web6_spring/readme.txt