no message
Merge branch 'local-master2' into local-master

Conflicts:
	opis.txt