b2
b3
Merge remote-tracking branch 'origin/master' into b

Conflicts:
	sample.txt
b
Merge remote-tracking branch 'origin/b'

Conflicts:
	sample.txt