Slider
Merge branch 'master' of https://github.com/MaticKonecnik/ProjektFERI

Conflicts:
	web/index.php
Merge branch 'master' of https://github.com/MaticKonecnik/ProjektFERI

Conflicts:
	web/index.php
Nekaj