Merge, I guess
Merge branch 'master' of https://github.com/gabc/map-editor
Plus de code