Added HP bar
Fixed merge conflicts