roll back to collision with npc

roll back to collision with npc
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks