more duct tape
Merge branch 'master' of git://github.com/tavisrudd/polyglotconf.github.io into tavisrudd-master

Conflicts:
	_harp/public/workshops/_data.json