Deploying to heroku from travis-ci
Merge pull request #19 from ryog/deploying_to_heroku_from_travis

Deploying to heroku from travis-ci
Merge pull request #20 from ryog/develop

Merge develop to master