Merge branch 'nick' of https://github.com/jacoblwright/hit into andy
Update
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy
Pushing GUI implementation, Products

Conflicts:
	.DS_Store
	test-src/model/BarcodePrinterTest.java
most recent gui code for Containers
removed junk files
change ChangeObject
good start on controller implementations
prep
forgot to change my call o the static method.
updated
add code to build.xml
Merge branch 'nick' of https://github.com/jacoblwright/hit into jake

Conflicts:
	test-src/model/ItemTest.java
prep
prep