weapon selected buttons added
fixed the health bar
merging...?