Fixing Lucas bad merge
Initial Sound push.
Health Regen Effect
Merge branch 'Myles'
a quick change in the names of some functions