Changed stuff
Merge branch 'master' of https://github.com/depstein/ggj-2014