Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Combat fixed up a bit
Merge branch 'master' of https://github.com/Wahn128/Flexible-Survival
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Combat resolution improved
Improvement to form recall

Signed-off-by: David Silver <dms.silver@gmail.com>
Merge branch 'master' of https://github.com/Wahn128/Flexible-Survival
punctuation fix on infection
save/load fixed?