Comments in InventoryObject
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Standard Assets/Scripts/General Scripts/InventoryObject.cs
	Assets/Standard Assets/Scripts/General Scripts/InventoryObject.cs.meta
	Assets/Standard Assets/Scripts/General Scripts/TimerScript.cs.meta