Sprankles of changes
Merge branch 'master' into save

Conflicts:
	ExampleBot/src/overmind/ControlCenter.java
Merge branch 'master' of https://github.com/Mechdriver/starcraft-terran-bot

Conflicts:
	ExampleBot/src/driver/TerranBotDriver.java
	ExampleBot/src/overmind/ControlCenter.java