Kostur stranice
Promena
Merge remote-tracking branch 'origin/master'

Conflicts:
	index1.php
	kostur.php
	style.css