Merge branch 'master' of http://github.com/Nuku/Flexible-Survival.git
dom Icarus
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival