Merge pull request #75 from katiewood/master

recignises player and enemy have collided