Fixed merge conflict and added ability for supermarket to add/edit inventory
cant pull until i commit
gsdgs

gdsgs
Merge branch 'master' of https://github.com/truly-auto/SENG403

Conflicts:
	src/main/java/FoodLink/gui/SupermarketSys.java
	src/main/resources/SQL/Tables.sql
deleting <<<head stuff

no description
Merge conflict corrected again and re-added my changes to supermarketSys
fixed bug when adding inventory items in supermarket
Fixed unit field in supermarket inventory
-made an 'invoice' tab on SupplierSys for temporary use for printing
invoice
Updated the column titles
supermarket can only have one active new order form at a time
updated codes from eric
fixing merge conflict