all sorts of stuff
Merge branch 'master' of github.com:nguillemot/globalgamejam2012