Added New File
Added File
Merge branch 'NewBranch2' into NewBranch
Added new line to new file
Added new line to master
Merge branch 'master' into NewBranch

Conflicts:
	TestFile_3.txt