Returning to first file
Merge branch 'master' of https://github.com/KrisPetkov/Test-repository

Conflicts:
	Test.txt