Some changes 5:48

Minor Health Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreepyChristmas/package.bluej