Malin's grid-räknare
Merge branch 'malin'

Conflicts:
	backend/Grid.hs