nova zmena
blbost 2
no jo
Merge branch 'master' into mojabranch

Conflicts:
	LICENSE