Initial commit
Merge https://github.com/snegovick/map_editor