Layer system
Merge branch 'master' of https://github.com/slackito/GGJ13