Changed some things

I forget what
Merge branch 'master' of https://github.com/Advancing-Extreme-Information-Systems/Dry-Ice-Climber

Conflicts:
	build/classes/dry/ice/climber/Climber.class
	build/classes/dry/ice/climber/DryIceClimber$GameUpdater.class
	build/classes/dry/ice/climber/DryIceClimber$InputListener.class
	build/classes/dry/ice/climber/DryIceClimber.class
	build/classes/dry/ice/climber/Enemy.class
	build/classes/dry/ice/climber/GamePerson.class
	build/classes/dry/ice/climber/GameSurface.class