Enemy collision detection

issues earlier merging branches on local machine