fixed merge errors with healthbar sizing
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga