new style
Merge branch 'master' of https://github.com/projectteam5/Project1.git

Conflicts:
	src/SaleGUI.java