Set the hitchhiker's position to the ship when he's on board
Merge branch 'master' of https://github.com/wilbefast/mini-ludum-dare-42
Merge branch 'master' of https://github.com/wilbefast/mini-ludum-dare-42
Merge branch 'master' of https://github.com/wilbefast/mini-ludum-dare-42
Merge branch 'master' of https://github.com/wilbefast/mini-ludum-dare-42
Removed several kevin's lines of fix code that one of mine fixed anyway