价格及注释
冲突
Merge branch 'master' of https://github.com/Software-statistics/Statistics

Conflicts:
	end/cgi-bin/commodity.py
	end/cgi-bin/singlecomment.py
	end/singleprice.py