- moving stuff around, Confetti added, shield added
- conflict resolved

Conflicts:
	ZooChase/Hero.m