Empty commit.
Merge branch 'Victor' of https://github.com/ZavaStudios/SeniorCapstone into Victor

Conflicts:
	Assets/Scripts/Unit.cs
	Assets/Scripts/UnitPlayer.cs
Added two GUI interfaces for switching weapons; only using 1. Added some information to each weapon.
Added some attributes to weapons. Added an inventory to hold weapons. Added a gui which allows button presses to switch weapons. BUG: Weapon model switches but the weapon reference is set to null.
Merge branch 'Victor' of https://github.com/ZavaStudios/SeniorCapstone into Victor

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Scripts/BaseItem.cs.meta
	Assets/Scripts/BaseItemEquipable.cs.meta
	Assets/Scripts/BaseItemWeapon.cs.meta
	Assets/Scripts/Hud.cs.meta
	Assets/Scripts/Inventory.cs.meta
	Assets/Scripts/MineableBlock.cs.meta
	Assets/Scripts/Unit.cs
	Assets/Scripts/UnitPlayer.cs
	Assets/Scripts/WeaponPickaxe.cs.meta
	Assets/mainGame.unity
Merge branch 'Victor'