merge
added Health Bars