Added healthbar to player
merge