merge test
provoking merge conflict
Merge branch 'master' of https://github.com/ChristofNolle/gitshop_christof

Conflicts:
	test.txt