Drop offer request implemented
Merge branch 'master' of git@github.com:CoffeeTeam/AuctionHouse.git

Conflicts:
	src/gui/GUI.java
	src/gui/IGUI.java
	src/server/ServerUtils.java
	src/states/BuyerState.java
	src/user/User.java