sdasdsa
daerge branch 'master' of https://github.com/smikodanic/proba

Conflicts:
	mojte.txt