updated file from newBranch
one more update
Merge branch 'newBranch'

Conflicts:
	testFile.txt