fixed merge conflict. restored healthbar change
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga

Conflicts:
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/InteractiveEntity.java