Fixed up hot water
Trying to fix wierd conflict error

Conflicts:
	src/code/wizard/spell/SpellHotWater.java