NPC Combat and Player Death update
Merge branch 'master' of https://github.com/RCARL/CS380Unity

Conflicts:
	Assets/voxels/chunk.cs