Merge pull request #20 from dockiler/REST

Rest
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
Merge pull request #23 from dockiler/master

a
Merge pull request #8 from zapiski/master

hn