Add a webserver
Add heroku deployment instructions
Flatten the bacon category
Merge branch 'flatten-bacon'