edit b.txt
Merge branch 'master' of https://github.com/Hongzheng-Li/testbed

Conflicts:
	b.txt