Finalized Health and Damage Calculations
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Assets/LivingRoom.unity