Merge pull request #4 from zapiski/master

Rest
Heroku deploy
Localhost deploy
Merge pull request #25 from rokkolesa/master

Heroku deploy