Merge pull request #14 from ParadiseSS13/master

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

Stamina