FINALLY DONE WITH BATTLE!

So pleased so so so so pleased
Merge branch 'master' of https://github.com/AdamDeHovitz/Empire

Conflicts:
	France.class