dialogues are pretty much done
Merge branch 'nick' of https://github.com/jacoblwright/hit into andy

Conflicts:
	src/gui/inventory/InventoryController.java