Merge branch 'master' of http://github.com/Nuku/Flexible-Survival.git
Merge branch 'master' of http://github.com/Nuku/Flexible-Survival.git
correcting fixes