had to push to pull
Merge branch 'master' of https://github.com/Slicey4/homework_6

Conflicts:
	task1/src/ee/ut/math/tvt/salessystem/domain/data/SoldItem.java