Changes made to Cat class to work with Sound Manager in BatsEverywhere
(Diana Cheung)
Trivial
Merge branch 'master' into ItemsWithInventory

Conflicts:
	minimap.png

	
Finalized powerups
Merge branch 'master' into ItemsWithInventory

Conflicts:
	minimap.png
Merge branch 'master' into ItemsWithInventory