Updated Sexy Graphics and such
Fixed Conflict
Merge branch 'master' of https://github.com/amurat/ggj2014