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
For Evan
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
hopefully this fixes data converter from getting wiped out