Fixed merge broohaha
Merge branch 'master' of github.com:cedophile/global-game-jam-2013