Added Elf Spritesheet.
Fixed health bar issues and player regen revival.
Fixed merge conflicts.
Merge branch 'pccnb-master'
Player 2 elf spritesheet.