test
blah

woreds
Merge remote-tracking branch 'origin/Leah'
Merge remote-tracking branch 'origin/master'
Filling

Changes 7/17
Merge remote-tracking branch 'origin/Heath'
Merged Matts branch in
blah

woreds
Calculations fixed again
blah

woreds
ok
A work in progress
test CashInBunker push
Added Leah's
Merge branch 'John' of https://github.com/KillerQuag/POS_System into John
Pre adding Display testing stuff
7/20

reAdded UIDs to Item[], moved scanning code to scanning
Add matt
Overhaul with UI seperation
Added Heath's Display changes