recignises player and enemy have collided
Merge pull request #75 from katiewood/master

recignises player and enemy have collided
Merge remote-tracking branch 'upstream/master'