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
Merge branch 'andy' of https://github.com/jacoblwright/hit into nick

Conflicts:
	.DS_Store
	src/gui/inventory/InventoryController.java
	test-src/model/BarcodePrinterTest.java
Merge branch 'andy' of https://github.com/jacoblwright/hit into andy

Conflicts:
	src/gui/inventory/InventoryController.java
More updateds for Phase 2.
Got batch controllers sharing functionality with super class, still needs work
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy
Message
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
need to finish pulling branches to fix compile issue
prep
fixed merge conflicts, lots of build problems
committing merge conflict changes fixed most issues
Adding File for Nick
Hello Nick!
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
commiting before push
Merge branch 'nick' of https://github.com/jacoblwright/hit into andy