Inventory updates correcty
Merge branch 'master' of https://github.com/tgashby/AdrenRush

Conflicts:
	main.lua