Drop it like its hot
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Inventory/Inventory.cs
Merge branch 'master' of https://github.com/ccharlesgb/lowpolysurvival

Conflicts:
	Assets/Scripts/Inventory/Inventory.cs