weis' change
Merge remote-tracking branch 'origin/master'

Conflicts:
	MechaMitchell.html
fixed bullet despawn and added enetrees
Merge branch 'master' of https://github.com/yugimon/MechaMitchell-Saves-the-Environment