I don't know, git says I changed stuff
Merge branch 'master' of https://github.com/Trollgeir/Diplomacy_AI