added a frame to enemy
Merge branch 'master' into new_collision