baza.
Merge branch 'master' of https://github.com/juree/fritrznica

Conflicts:
	fritrznica/fritrznicaData