Fixed enemy movement when goku's colliding. Fixed obstacle collisions to respond correctly.
Merge remote-tracking branch 'origin/master'