New Camera, Helicopter
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/revamp.unity
	Assets/Scripts/Inventory/InventoryShower.cs