Initial version of uncommented Contour branch
Initial changes for Contour
New function for sqare grid generation
Small style changes
Merge branch 'fixing-contour'

Conflicts:
	PictureDSL.hs
	Viewer.hs