brought back lost behavior
Merge branch 'master' of https://github.com/brdunfield/GGJ2014