Revert "edited again"

This reverts commit 81201f7bb18fd11fb59b73e55cb338be4818c61d.
Merge branch 'master' of https://github.com/Richieswansea/TestRepository into HEAD

Conflicts:
	TestFiles/File3.txt
lost now
Merge branch 'feature' of https://github.com/Richieswansea/TestRepository into test_branch

Conflicts:
	TestFiles/File3.txt
Merge branch 'test_branch'

Conflicts:
	TestFiles/File3.txt