modified main from desktop
Merge remote-tracking branch 'origin/master'
Modified test 4
modified both files from desktop
Merge remote-tracking branch 'origin/master'

Conflicts:
	SalesTool/src/itu/dk/sales/Sales.java