updated testfile in testBranch
Merge branch 'testBranch'

Conflicts:
	testFile.txt