Add basic functionality
Merge branch 'master' into temp

Conflicts:
	Line.hs
	Main.hs
Merge remote-tracking branch 'origin/temp' into temp