upgraded electric shocker
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Eric/Felinoid scene, Power Plant Update, Underwater Update
Merge branch 'master' of https://github.com/Wahn128/Flexible-Survival