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

Conflicts:
src/main/java/FoodLink/gui/SupermarketSys.java
src/main/java/FoodLink/gui/SupplierSys.java
fudging conflict