task two, part two
working on task two, part three
Merge branch 'master' of https://github.com/StenM/Helmut.git
trying to merge
Conflicts:
	POS/src/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.java