Test file comment
Merge branch 'master' of https://github.com/dmatocha/potayto.git

Conflicts:
	TestFile.txt