heroku fixes
fixed heroku graph issue
fixed merge conflict
Merge pull request #24 from jpk1215/heroku-stuff

Heroku stuff