part 2 commit
Merge branch 'B1' into B2

Conflicts:
	First File.txt