Deleted third line from file?
Merge branch 'master' of https://github.com/simgar/hairy-octo-nemesis

Conflicts:
	TestFolder/TestFile3.txt