Fixed the damage calculations for the castle.
Merge branch 'master' of https://github.com/VoraciousSoftworks/Here-There-Be-Dragons

Conflicts:
	src/com/voracious/dragons/client/towers/Castle.java
	src/com/voracious/dragons/common/GameState.java