tried to fix method 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Interface/Supermarket.java
Merge branch 'master' of https://github.com/jelmerhulsman/Supermarket