cleaning up merge conflicts lines
testing

Signed-off-by: ericckk <kingem43@hotmail.com>
Merge branch 'master' of https://github.com/truly-auto/SENG403

Conflicts:
	invoice_supermarket2.xls
	src/main/java/FoodLink/gui/SupermarketSys.java

merging to master