Merge branch 'evan' of https://github.com/jacoblwright/hit into andy

Conflicts:
	.DS_Store
	test-src/model/BarcodePrinterTest.java
More updates to my stuff.
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy
Getting Jake's Stuff
prep
prep