Merge pull request #30 from echen027/master

working with heroku