get rid of merge conflict, fix stuff
Merge branch 'master' of https://github.com/Oneman2feet/Cornell-Game-Jam-2013