Succubus Lilith, herm/female demon brute pet
Fixed bad merge

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

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