zmiana 10,11 local
Merge branch 'master' of https://github.com/piotrdolistowski/TestowyProjekt

Conflicts:
	test.txt