update
.
Error fixing.
Merge branch 'master' of https://github.com/NLSteveO/CS3716-Project

Conflicts:
	.project
	game/character/Character.java
	game/character/NewCharacter.java
	game/character/Status.java
	game/country/Country.java
	game/government/Democracy.java
	game/government/Dictatorship.java
	game/government/Government.java
	game/map/Map.java
	game/map/Territory.java
git is being a pain