Minors 
	- fiddled with the hurt responce
some some crap
So there were some conflicts

Merge remote-tracking branch 'why/masterOfAllThatIsEvil' into
masterOfAllThatIsEvil

Conflicts:
	SwampMonster/bin/com/me/swampmonster/models/Enemy.class
	SwampMonster/bin/com/me/swampmonster/models/L1.class
	SwampMonster/src/com/me/swampmonster/models/Enemy.java
	SwampMonster/src/com/me/swampmonster/models/L1.java