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
Minor change
Merge remote-tracking branch 'origin/dev' into dev
...
Removing .idea from git, because it shouldnt be there
...
trying to remove .idea
removing
removing
...
removing .idea
added gitignore
removing .idea
...
...
...
removing out
...
removing .settings