Basic bidding functionality done
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineAuction/src/controller/Controller.java