Merge branches 'master' and 'master' of ssh://github.com/asisaac/PuzzleWizard
stuff