recent changes manual merge
Merge branch 'master' of github.com:rommg/PuzzleCreator