b1c2
Merge branch 'origin/master'

Conflicts:
	text2.txt
Merge branch 'b01'