Merge pull request #1 from greggman/master

Get latest
Merge pull request #2 from greggman/master

Fix explosions
Merge branch 'gh-pages' of github.com:greggman/doodles into gh-pages
wip