client for stage 4 should be fine now
undone my changes
Merge branch 'master' of https://github.com/ckubin/dslab3.git

Conflicts:
	src/biddingClient/Client.java