Inventory boxes now ask for the dwarf by name on click
Merge branch 'master' of https://github.com/kevinmee/FinalProject

Conflicts:
	js/dbclient.js