ok
blah

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

Changes 7/17
GUI stuff added
GUI .display changed
Merge remote-tracking branch 'origin/Heath'
Merged Matts branch in
blah

woreds
Calculations fixed again
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
Name changed

Test to fix the Git nonsense
testagain