Did some minor editing type stuff
Conflicts:
	War.class
	War.java