Merge remote-tracking branch 'origin/master'

Conflicts:
	IceGame/IceGame/IceGame/CharacterStates.cs
added catapult_collision.png

added for collsion detection