Made a few changes
Merge branch 'TestBranch'

Conflicts:
	AnotherTestFile.txt
Added Test File 2
Change to Test File 2