Heroku power!
Merge pull request #17 from daleee/heroku-merge

Heroku power!