ship npc movement
Merge branch 'master' of https://github.com/STzvetkov/Jodi-Picoult