Worked on health meter
Merge branch 'Scott'