InventoryUpdate
Merge branch 'master' of https://github.com/vanblaze/honeypot

Conflicts:
	app.js
	game.html