commit 4
Merge branch 'HEAD' of https://github.com/alicona/TestRepo.git

Conflicts:
	test.txt
ones