no message
Merge branch 'master' of https://github.com/baszalmstra/aifc and added drawing of bullet (does nothing)

Conflicts:
	src/battle.h