Stamina
Merge pull request #64 from Fox-McCloud/Stamina

Stamina
Merge pull request #16 from ParadiseSS13/master

Merge from Master