FOSNA IZMJENA
Merge branch 'master' of https://github.com/CroFranko/predavanje

Conflicts:
	File.txt