slider koga nema
Merge remote-tracking branch 'origin/master'

Conflicts:
	index1.php
	sliding-boxes-css3/style.css