fixes
Merge branch 'master' of github.com:alamboley/GGJ-2014