Added enemy bat collision
Merge origin/sam into sam