prep
prep
removed DS_Store files
Merge branch 'jake' of https://github.com/jacoblwright/hit into nick

Conflicts:
	.DS_Store
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick

Conflicts:
	.DS_Store
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into nick

Conflicts:
	.DS_Store
	src/gui/inventory/InventoryController.java
	test-src/model/BarcodePrinterTest.java
prep
prep
Added upc-a barcode creation algorithm to Barcode class
Added timer functionality to AddItemBarchController
Added TextFieldTimer class
Got batch controllers sharing functionality with super class, still needs work
adding a couple more fixes
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick

Conflicts:
	.DS_Store.BASE.1949.DS_Store
	src/gui/inventory/InventoryController.java
	src/model/Container.java
added more functionality for add/edit product group
prep
need to finish pulling branches to fix compile issue
fixed merge conflicts, lots of build problems
committing merge conflict changes fixed most issues