debug
Merge branch 'master' of https://github.com/darzul/bid

Conflicts:
	src/bid/Bid.java