Yet even more updates.
prep
Merge branch 'nick' of https://github.com/jacoblwright/hit into andy
prep
Stuff for Evan
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
Commit for Evan
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
prep
Merge branch 'nick' of https://github.com/jacoblwright/hit into andy

Conflicts:
	src/gui/inventory/InventoryController.java
hopefully final push
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick

Conflicts:
	src/gui/batches/AddItemBatchController.java
	src/gui/inventory/InventoryController.java
Commit
Commit
final commit before pulling for phase 2 implementation
Merge branch 'andy' of https://github.com/jacoblwright/hit into nick
final polish on a couple minor issues, commented out failed junit tests mostly on toString testing