Merge remote-tracking branch 'origin/kallikrates'
Merge branch 'master' of https://github.com/kairosfractes/UncleJemimasOldStyleMapGenerator