dodano ppkt "ja pierdole"
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_2.html