Added support for cells in the grid and other stuff
Merge branch 'master' of https://github.com/golgoth/sand-castle
Misc
Merge branch 'master' of https://github.com/golgoth/sand-castle

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

Conflicts:
	game.py