Make bid
Merge branch 'master' of github.com:oleander/jbay

Conflicts:
	JADE/src/Buyer.java
Fix con.
Fix some stuff