meteor spell started.
Merge branch 'Version1' of https://github.com/3ternal5hadows/MobaRepo into Version1

Conflicts:
	unity/unity.userprefs
updated throw shuriken
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
Added meteor
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
Still debugging
Merge branch 'Version1' of https://github.com/3ternal5hadows/MobaRepo into Version1

Conflicts:
	unity/Assets/Prefabs/DaggerPrefab.prefab
	unity/Assets/Prefabs/PlayerUpdate.prefab
	unity/Assets/Prefabs/Volundrund 1.prefab
	unity/Assets/scripts/Weapons/WeaponContainer.cs
	unity/unity.userprefs