jo
Merge remote-tracking branch 'origin/master'

Conflicts:
	teksty/mediumjestmasarzem.md