Updated with health system
Merge branch 'master' of https://github.com/untamemadman/untamemadman.github.io