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