muutus
imelik..
commiting yo
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/bin/.gitignore
	POS/build/classes/ee/ut/math/tvt/silveri_meeskond/domain/data/SoldItem.class
	POS/build/classes/ee/ut/math/tvt/silveri_meeskond/domain/data/StockItem.class
	POS/build/jar/silveri_meeskond.jar
	POS/data/POSdb.lck
	POS/data/POSdb.log
	POS/data/POSdb.properties
	POS/data/POSdb.script
	POS/log/log.log
	POS/version.properties