player and ship changed
Merge origin/master