Jack+Jill, Blue+Purple
Jane+Joe, Red+Green
Merge branch 'b1'

Conflicts:
	MergeConflict.txt
patches from 1.2 exercise added

cherry-pick for MergeConflict.txt