Merge branch 'master' of https://github.com/Nuku/Flexible-Survival.git
stage 2 started
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival