izmenjen route.php file
bla bla
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Enciklopedija/application/config/routes.php
oooo