Testing ItemLabelController.java
Merge branch 'master' of https://github.com/l3370x/byu-340-hit

Conflicts:
	inventory-tracker/src/gui/batches/AddItemBatchController.java
	inventory-tracker/src/gui/batches/IItemLabelController.java
Merge branch 'master' of https://github.com/l3370x/byu-340-hit