likely working code
Merge branch 'master' of github.com:/abarbu/icfp2013

Conflicts:
	src/main.scm
	src/more-stuff.scm