Test1 txt
Test1 txt
Merge branch 'master' of https://github.com/piemeson/TestRepo.git

Conflicts:
	Test1.txt