Corrects companion orders text
Resolves merge conflicts
Merge branch 'master' of https://github.com/AstroTeam/Game