working on Dagger and Hammer
fixed dagger up
Merge branch 'weaponDev' of https://github.com/3ternal5hadows/MobaRepo into Greg

Conflicts:
	unity/Assets/scripts/Weapons/WeaponContainer.cs