Merge branch 'gh-pages' of https://github.com/msemelman/pirate-ninja-zombie-soldier into gh-pages

Conflicts:
	assets/demo-mariano.json
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages
merge
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
delete gh-pages default