fixes git shit
Merge https://github.com/chuckleplant/ggj2014