Chris, where's my health bar?

It's right here.  Just weeks behind schedule...
Commit to help with merge
Cleaning up some code
Merged in healthbar