master c2
b1c2
Merge remote-tracking branch 'origin/b1' into b1

Conflicts:
	lib/simplegit.rb