prep
prep
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
prep
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
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
Deleted .orig file
Fixed bug in InventoryController.deleteProduct()
Fixed bug in InventoryController.addProductToContainer()
basic functionality
updated
Bug fixes.
Merge branch 'jake' of https://github.com/jacoblwright/hit
More bug fixes.