Commita all
Merge branch 'master' of github.com:mstajdohar/tmp

Conflicts:
	tekst
Con refoMerge branch 'master' of github.com:mstajdohar/tmp

Conflicts:
	tekst