prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
prep
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
made my part more like the demo
prep
Merge branch 'jake' of https://github.com/jacoblwright/hit into evan
pretty much working, barcode mode calling display messages
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
prep
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick

Conflicts:
	src/gui/inventory/InventoryController.java
	src/model/ItemManager.java
Yet even more updates.
hopefully this fixes data converter from getting wiped out
Merge branch 'nick' of https://github.com/jacoblwright/hit into andy
Stuff for Evan