fixing some off-by-one errors
Merge branch 'master' of https://github.com/awwaiid/icfp2014