change bidhistory sql and view
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/bidHistory.ejs
bidhistory