Ninja Pumpkin Mutants
Merge branch 'master' into pr/143

Conflicts:
	index.json