Revert "InventoryObject and ThirdPersonController nixed"

This reverts commit 29c564cde29c1b066e78f4eab45595fce903e664.

Conflicts:
	Assets/Start.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Start.unity