commit on b1
Merge branch 'master' into b1

Conflicts:
	test.txt
Merge branch 'master' into b1

Conflicts:
	test.txt
Merge pull request #3 from tfujiwar/b1

B1