test 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	plik_testowy.txt
test 3