555
Merge remote-tracking branch 'origin/master'

Conflicts:
	zadaca_01/public_html/mkovacek.css