M/M bottom
Naga oral
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
fixed to compile

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