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
removing .idea
...
...
removed out and .settings
Base development of class Battle which controls the flow and logic of in-game battles. Refined a number of concepts to facilitate this. Still incomplete, but console output testing will be feasible soon.
Merge remote-tracking branch 'origin/battle' into battle
Moved the functionality in Battle into the BattleInterface.
Started working on the BattleRenderer
Modified BattleAction and BattleInterface heavily to reflect how I believe BattleActions should be handled
...
Updated BattleClass into a full on enum, and a few other things
Removed the now-obsolete Battle (moved to BattleInterface
Renamed Character to BattleCharacter for specificity
merged with dev and started implementing battle dialogue
merged with dev and started implementing battle dialogue
merged with battle and other things