finished the basics of the war starter
test
Merge branch 'master' of https://github.com/kraftman/Empires.git

Conflicts:
	src/main/java/es/themin/empires/util/Empire.java
fixed dodgy merge