Merge pull request #33 from riachkyle/Nick

Heroku Launch