merged
Merge branch 'master' of https://github.com/MrSnickers/map_game