New test
Merge remote-tracking branch 'origin/master' into b1

Conflicts:
	README.md
Merge branch 'b1'
Correction
Merge remote-tracking branch 'origin/b2'