github update test

staff test change
Merge pull request #7 from hufi/master

github update test
Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commits:
test
Supplier tab updates
Merge pull request #9 from conclarke/master

Supplier tab and login updates
No change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/group2/RetailSystem.java