Committing my small change because it won't let me merge until I do
this.
Merge remote-tracking branch 'origin/master'

Conflicts:
	micrortsx/micrortsx/src/ai/Athena/AthenaAI.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	micrortsx/micrortsx/src/ai/Athena/AthenaAI.java