some changes
Merge branch 'master' of github.com:kanigsson/icfp2013

Conflicts:
	src/main.ml