player can now jump on enemy heads
forgot one line
Merge remote-tracking branch 'origin/master' into dan-dev
Merge remote-tracking branch 'origin/master' into dan-dev
added some classes for dev
added shield dude
Merge remote-tracking branch 'origin/master' into dan-dev

Conflicts:
	MagnetBoy/MagnetBoy/MagnetBoy/ShieldDude.cs
	MagnetBoy/MagnetBoy/MagnetBoyContent/shieldGuy.xml
	MagnetBoy/MagnetBoy/MagnetBoyContent/shieldGuySheet.png
fixed shielddude stuff
Merge remote-tracking branch 'origin/master' into dan-dev

Conflicts:
	MagnetBoy/MagnetBoy/MagnetBoy/LevelState.cs
fixed endLevel bug in level LevelState

wasn't removing entities when they needed to be
Merge remote-tracking branch 'origin/master' into Eric-Temp