Inventory is plodding along
Merge branch 'master' of git://github.com/ploe/rpg

Conflicts:
	Bag.lua
	main.lua