LAME
Merge branch 'master' of https://github.com/Trollgeir/Diplomacy_AI

Conflicts:
	src/communication/Sender.java
	src/kb/Map.java