commit to pull
Merge branch 'master' of https://github.com/threonorm/simulisp

Conflicts:
	haskell/graph.hs
Scheduler