Branch Publish

no changes
Merge remote-tracking branch 'origin/John' into John

Conflicts:
	src/master/Main.java
ProductDB gets a constructor
Merge remote-tracking branch 'origin/master' into John

Conflicts:
	src/master/productDatabase.java
Conflicts resolved.
More resolve