Merge branch 'testBranch1'

Conflicts:
	testFile1.txt