Adding background to health bar, animating it
Resolving merge conflicts