Rename variables with stupid names
Merge branch 'master' of github.com:matessim/GGJ2014