remove collision with bats
Merge branch 'master' of https://github.com/markhatch/SamuraiChamp

Conflicts:
	SamuraiChamp.userprefs