Merged:
Merge branch 'master' of https://github.com/2m/gamejam2014