Added HP and Mana altering Functions to Entity
Added Consumables
Added ToString to all dice classes
Added Description to Item Class
Added toString methods for getting Damage Dice and Threat ranges to Weapon
Updated UML
csproj
Merge branch 'master' into Consumable

Conflicts:
	CSCD454-FinalProject/Weapon.cs
	FinalProjectUML/FinalProjectUML.classdiagram
	FinalProjectUML/FinalProjectUML.classdiagram.layout
	FinalProjectUML/ModelDefinition/FinalProjectUML.uml
Merge branch 'Consumable'