Merge branch 'master' into NewBranch2
Merge branch 'NewBranch' into NewBranch2

Conflicts:
	TestFile_3.txt
Merge branch 'master' into NewBranch2

Conflicts:
	TestFile_3.txt