Merge pull request #4 from zapiski/master

Views
Merge pull request #15 from rokkolesa/master

First draft of partial views
Merge pull request #16 from Osebek/master

Merge pull request #4 from zapiski/master
Merge pull request #3 from zapiski/master

n
Merge pull request #17 from rokkolesa/master

Small changes to views
Merge pull request #18 from dockiler/master

Merge pull request #3 from zapiski/master
Merge pull request #4 from zapiski/master

g
Rest
r
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 #4 from zapiski/master

Rest