Fajli
Merge branch 'master' of https://github.com/Osebek/IPRI_project

Conflicts:
	app/partials/main.html
	app/partials/user.html