Bid fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/show_auction.html