Homework_4
Merge branch 'Other' of https://github.com/eliise/teamviis

Conflicts:
	POS/.classpath
	POS/build.xml
	POS/src/ee/ut/math/tvt/salessystem/domain/controller/SalesDomainController.java
	POS/src/ee/ut/math/tvt/salessystem/domain/controller/impl/SalesDomainControllerImpl.java
	POS/src/ee/ut/math/tvt/salessystem/domain/data/SoldItem.java
	POS/src/ee/ut/math/tvt/salessystem/domain/data/StockItem.java
	POS/src/ee/ut/math/tvt/salessystem/ui/SalesSystemUI.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/PurchaseInfoTableModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/SalesSystemModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/StockTableModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/HistoryTab.java
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab.java
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/StockTab.java
	POS/src/ee/ut/math/tvt/teamviis/Intro.java
	POS/src/ee/ut/math/tvt/teamviis/IntroUI.java
	POS/version.properties