Why does Git hate me, makes me commit to get any changes
Merge remote-tracking branch 'origin/master'

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