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

Conflicts:
	.DS_Store
Changed enum Unit to Enum<SizeUnits>
prep
Updated ProductAndItemEditor royally