add .env to .gitignore
use unicorn via procfile
update config file to serve static assets
fix merge conflicts
Merge pull request #21 from kyledaugherty/heroku

Heroku