some other test
next line
Merge branch 'master' of https://github.com/tomaszszlek/test

Conflicts:
	test.txt