Merge pull request #2 from zapiski/master

Bootstrap
Merge pull request #3 from zapiski/master

Bootstrap
Merge pull request #10 from rokkolesa/master

Merge pull request #2 from zapiski/master
Merge pull request #11 from dockiler/views

Views
Merge pull request #13 from Osebek/master

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

Views
Heroku debug
Merge branch 'master' of https://github.com/rokkolesa/IPRI_project
Heroku debug

dodal nazaj travis.yml
Heroku debug
Heroku deploy
Localhost deploy
Merge pull request #14 from rokkolesa/master

Nekej
Merge pull request #3 from zapiski/master

Views
Heroku deploy
First draft of partial 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