changes to b.txt
Merge branch 'b2'

Conflicts:
	b.txt