make bid
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/oleander/jbay

Conflicts:
	JADE/src/Buyer.java
Merge branch 'master' of https://github.com/oleander/jbay