Automated commit at 2014-12-29 12:49:36 UTC by middleman-deploy 1.0.0
Merge branch 'gh-pages' of https://github.com/pdbartlett/badthings into gh-pages

Conflicts:
	index.html