Herm Gryphon Fix
Kinky/Submissive Wrestling Variants with Philip, Ball description fix
Resolve bad merger

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