Battle fixes and some previous oversight corrects
Merge branch 'master' of https://github.com/AdamDeHovitz/Empire

Conflicts:
	War.class
	War.java