Test change
Merge branch 'master' of https://github.com/nowakowskir/dummy-project

Conflicts:
	test.txt