Branch Publish

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

Conflicts:
	src/master/Main.java
Added 30 items to DB.
Started work on POSRegister
ProductDB gets a constructor
Merge pull request #1 from KillerQuag/Leah

test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/master/CashInBunker.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into John

Conflicts:
	src/master/productDatabase.java
Conflicts resolved.
More resolve
Merge remote-tracking branch 'origin/Leah'
blah

woreds
ok
A work in progress
test CashInBunker push