debug
Merge branch 'master' of https://github.com/NJU-HouseWang/Amazon_Index

Conflicts:
	Amazon_Index/templates/commodity.html
rename