Added item functionality
Merge branch 'master' of https://github.com/balstar5283/Fighter into characterdev

Conflicts:
	Assembly-CSharp.pidb
	Assets/Scenes/blank.unity
	Fighter-csharp.sln
	Fighter.sln
	Fighter.userprefs
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/3d/3d9354172c98c8943b226fb453352638
Readded files to be tracked
Changed collision detection
Boom
Attempted merge fix
Added item spawning

Changed item collision detection to be handled by both the item and the
character. Character uses OnControllerCollider while item uses
OnCollisionEnter. Items spawn randomly, and the item to be spawned is
random. Made prefabs of items to be spawned.
Ignoring Library folder again
Remove Library folder
Merge branch 'master' into uda