drop auction implemented
Merge branch 'master' of git@github.com:CoffeeTeam/AuctionHouse.git

Conflicts:
	src/mediator/IMediatorNetwork.java
Merge branch 'master' of git@github.com:CoffeeTeam/AuctionHouse.git