Merge pull request #36 from hhuang2088/master

Unicorns, Heroku, and minor corrections