handled -n -f if used both
Merge branch 'master' of https://github.com/Trollgeir/Diplomacy_AI