added hitboxes for more than just zombies, fixed z-positioning of slingshot
fix merge conflict