Ending.
Merge branch 'master' of github.com:mmerchante/vrjam

Conflicts:
	Assets/Scripts/PickupController.cs