Added basic health bar and implementation
Merge with fixed conflicts

Lets hope this works. Adding the Health bar commit from Master