blowing up the world
Merge branch 'master' of https://github.com/thfield/thewheel

Conflicts:
	index.html