yo
updating countries
Merge origin/master

Conflicts:
	src/freeWarOnTerror/Country.java
	src/freeWarOnTerror/CountryIran.java
	src/freeWarOnTerror/NonMuslimCountry.java
	src/freeWarOnTerror/Scenario.java
Merge origin/master

Conflicts:
	src/freeWarOnTerror/Country.java
	src/freeWarOnTerror/CountryIran.java
	src/freeWarOnTerror/NonMuslimCountry.java
	src/freeWarOnTerror/Scenario.java
fixed compilererrors
disagreements