heroku changes
fixed merge conflicts when merging with master
updated readme file to include heroku link
Merge pull request #12 from daino3/readme

YEAH!!!