4
a
Merge branch 'master' of https://github.com/WWettingfeld/TestRepo

Conflicts:
	testfile.txt