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

Conflicts:
	src/model/ProductManager.java
phase 4 impl
Fixed Phase 4 Bugs