Clay/mudball "C" and Tired "T" and etc.
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Prefabs/Player/Mage WithCam.prefab
	Assets/Scripts/Combat/Weapon.cs
Merge conflict commit
Merge pull request #84 from John5025/master

C = clayball (mudball), T = getTired, etc.