Signed-off-by: ghassen ticha <ghassen ticha@ghassen>
Merge branch 'master' of
ssh://git@github.com/ghassenalouini/turnt-archer.git

Conflicts:
	tn.edu.esprit.infini.theWolves.tvForExClient/src/tn/edu/esprit/infini/theWolves/tvForExClient/TestAddOffer.java
	tn.edu.esprit.infini.theWolves.tvForExClient/src/tn/edu/esprit/infini/theWolves/tvForExClient/TestAddTransaction.java
	tn.edu.esprit.infini.theWolves.tvForExClient/src/tn/edu/esprit/infini/theWolves/tvForExClient/jUnitTest/TestAddCountry.java
	tn.edu.esprit.infini.theWolves.tvForExClient/src/tn/edu/esprit/infini/theWolves/tvForExClient/jUnitTest/TransactionTest.java