Changed Puppies to Moose
Merge branch 'catdog'

Conflicts:
	manifest.json