Zigor prelim
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival