dupa
DiplomacyMode received its first button (no functionality yet)
Merge branch 'master' of https://github.com/arap/Chip-Totality.git

Conflicts:
	ChipTotality/src/com/gameInfo/GameStateHolder.java
	ChipTotality/src/com/screen/GameScreen.java