没改动
Merge remote-tracking branch 'upstream/master'
做次示范
主页页面重写
修复一个页面bug
group10logo  student6face
Merge remote-tracking branch 'upstream/master'

Conflicts:
	demo_COC/activity/models.py
Merge pull request #2 from longshenzhu/master

首页重写