Fixed stuff in Attacking and other stuff
Merge branch 'master' of github.com:golgoth/sand-castle
Merge branch 'master' of github.com:golgoth/sand-castle

Conflicts:
	elements.py
Merge branch 'master' of github.com:golgoth/sand-castle

Conflicts:
	elements.py
	game.py