Working on collision test
Merge branch 'master' of https://github.com/baszalmstra/aifc

Conflicts:
	src/battle.cc
	src/battle.h