ship fix
Merge branch 'master' of https://github.com/Stals/GameJam2014