commit merge
Merge branch 'master' of https://github.com/lukasz-mrowka-scentia/test.git

Conflicts:
	test2.txt