Background's working
Merge branch 'master' of github.com:CarrotIsland/puzzle-jam