Changed 2
Merge branch 'master' of https://github.com/Richieswansea/TestRepository

Conflicts:
	TestFiles/File3.txt