koment
Merge branch 'master' into nowa

Conflicts:
	plik1.txt