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

Conflicts:
	src/model/ProductManager.java
prep