Merge pull request #14 from zapiski/master

sadf
Merge pull request #64 from Osebek/master

Popravil search/orderBy
Merge pull request #65 from rokkolesa/master

Merge pull request #14 from zapiski/master
Merge pull request #15 from zapiski/master

merge
phantomJS
Merge branch 'master' of https://github.com/rokkolesa/IPRI_project
Merge pull request #66 from rokkolesa/master

PhantomJS
Merge pull request #4 from zapiski/master

phantomJS