merge
Merge remote branch 'upstream/master' into product
Merge remote branch 'upstream/master' into product
Merge remote branch 'upstream/master' into product
Merge remote branch 'upstream/master' into product

Conflicts:
	.gitignore
submit the early version
Merge remote branch 'hello/master'

Conflicts:
	backend/recommend_views.py
Merge remote branch 'hello/product'
modify the order problem of recommend page and format of the date
Merge pull request #62 from lucknessbuaa/master

modify the order of the recommend page and the format of the date