updates
Merge branch 'master' of github.com:awwaiid/icfp2014