ai changes
Merge branch 'master' of git@github.com:abranch6/AI-battle.git

Conflicts:
	AI-battle-project/src/GameController.java