There is an actual battle going on!
Merge branch 'master' of https://github.com/baszalmstra/aifc

Conflicts:
	src/battle.cc