Fuck the github
Merge branch 'master' of https://github.com/jszybisz/TestRepo

Conflicts:
	File 1.txt