updated text

I changed the text so it would match and added color on the health. I'm
going to ask chris tomorrow on how to get it to drop when the player
gets hit. I couldn't figure it out tonight.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DirectX11_Starter/DirectX11_Starter/Debug/PixelShader.cso
	DirectX11_Starter/DirectX11_Starter/Debug/VertexShader.cso
	DirectX11_Starter/DirectX11_Starter/DirectX11_Starter/Game.h