comments
gridbagconstraint x
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git
run & jrun
deleted build and classes
Build2-kiirem, aga lib on tal eraldi
make PropertyValues prettier
make it pretteh
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git
start working on task 2
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git
 commit from build file
 Task1 git add,commit, push
add to stock
 added git_tag target to build.xml
Add-to-warehouse functionality added.
Add-to-warehouse functionality added.
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git

Conflicts:
	POS/build.xml
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git

Conflicts:
	POS/build.xml