Moved Hit Test to Enemy
Merge remote-tracking branch 'origin/Eric-Temp'

Conflicts:
	MagnetBoy/MagnetBoy/MagnetBoy/Enemy.cs
player can now jump on enemy heads
forgot one line
fixed merge error and refactored health mod code