test 2
konfliktni kod
Merge branch 'master' of https://github.com/dzona/smjestajvgd

Conflicts:
	index.html