Added Collision Detection

- for enemy ShyGuy sprites
Resolved conflicts on merge