asdfg
Merge branch 'master' of https://github.com/colin353/mushuduck

Conflicts:
	stage/bidding.py