Adding the puzzle system
Merge branch 'master' of https://github.com/paked/lighter