fixed thangs n stuff
Merge branch 'master' of https://github.com/jds0102/GGJ2014