Updates
Merge branch 'master' of https://github.com/d14123081/team4

Conflicts:
	src/team4/retailsystem/view/test.java