Push before 5 PM meeting.
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy

Conflicts:
	dist/lib/inventory-tracker.jar
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy

Conflicts:
	dist/lib/inventory-tracker.jar
Commit before Jake pull
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy
For Jake
Fixed Product Editing
prep
merge
Merge branch 'andy' of https://github.com/jacoblwright/hit into jake

Conflicts:
	src/model/ProductManager.java
phase 4 impl