branch2 commit!
Merge branch 'b1'

Conflicts:
	readme.txt