Merge pull request #1 from zapiski/master

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

Conflicts:
	app/partials/main.html
	app/partials/user.html
Merge pull request #21 from Osebek/master

Dodan design v povezavi z REST