Player as Angie's Mate, small fixes
resolve bad merge.

Signed-off-by: David Silver <dms.silver@gmail.com>
Merge branch 'master' of https://github.com/Wahn128/Flexible-Survival