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

Conflicts:
	unity/Assets/scripts/Weapons/WeaponContainer.cs
Fixed bugs, made 2 errors that make no sense and the game still works but shouldn't.
Merge remote-tracking branch 'origin/weaponDev' into Michael

Conflicts:
	unity/Assets/Scenes/MainMenu.unity
	unity/Assets/scripts/Weapons/WeaponContainer.cs
	unity/unity.userprefs

Stupid thing
Merge branch 'Michael' into Version1

Conflicts:
	unity/Assets/Scenes/WeaponSelect.unity
	unity/Assets/scripts/Weapons/WeaponContainer.cs
Merge branch 'Version1' of https://github.com/3ternal5hadows/MobaRepo into Version1

Conflicts:
	unity/Assets/Scenes/WeaponSelect.unity