modify b.txt 22
Merge branch 'master' of https://github.com/PengCX/GitTest2

Conflicts:
	b.txt