updates to health bar and energy bar
Merge branch 'master' of https://github.com/CamdenSegal/PhillyGameJam2013