nothing.
Merge branch 'master' of https://github.com/Trollgeir/Diplomacy_AI
mapinfo added
fixed merge