Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Wildcat Overhaul
Merge branch 'master' of https://github.com/BlueBishop/Flexible-Survival
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Fix to compile

Signed-off-by: David Silver <dms.silver@gmail.com>
Resolve bad merge

Signed-off-by: David Silver <dms.silver@gmail.com>
husky heat update