Starting to get the structure of the battle down. Comments/criticism are welcome.
Merge remote-tracking branch 'origin/battle' into battle

Conflicts:
	.idea/workspace.xml