added castle.isInside(x,y) and cleaned up.
Merge branch 'master' of https://github.com/barooney/marchgamejam.git

Conflicts:
	castle.js