no message
afds
version
ok
A
IGELKOTT
Merge branch 'master' of https://github.com/SteamRiC/TeamNumberTwo into props2

Conflicts:
	POS/log.log
	POS/src/ee/ut/math/tvt/teamnumbertwo/Intro.java
	POS/src/ee/ut/math/tvt/teamnumbertwo/IntroUI.java
no message
tere
Proovin faile ka üles saada.
Tegelen.
no message
Merge branch 'master' of https://github.com/SteamRiC/TeamNumberTwo

Conflicts:
	POS/build/classes/ee/ut/math/tvt/salessystem/domain/data/DisplayableItem.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/model/SalesSystemTableModel.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel$1.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel$2.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.class
	POS/src/ee/ut/math/tvt/salessystem/domain/data/DisplayableItem.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/SalesSystemTableModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.java
???
Jah.
runc
no message
:/