Fixed bug with collisions, added base for "attack"
Merge branch 'master' of github.com:golgoth/sand-castle

Conflicts:
	game.py
Merge branch 'master' of github.com:golgoth/sand-castle
Fixed bug in collisions + attack stuff
Merge branch 'master' of github.com:golgoth/sand-castle

Conflicts:
	elements.py
	game.py