?
Merge branch 'master' of https://github.com/golgoth/sand-castle

Conflicts:
	state.py
aded castle
added pictures
added castle
Merge branch 'master' of https://github.com/golgoth/sand-castle

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

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