dsfdsf
Merge remote-tracking branch 'refs/remotes/origin/Annbranch' into Annbranch
Merge remote-tracking branch 'refs/remotes/origin/master'
我为锻炼页面添加了一片文章，添加了链接。
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
我换了版图下面提示的小图片
二级页面滑动图片更改
Show the picture in weibo.
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge branch 'refs/heads/Annbranch'
我为add.html页面改变了推荐块的内容，点击可以链接到相应页面
Merge remote-tracking branch 'refs/remotes/origin/master'
视频与文章的分页显示
Merge branch 'refs/heads/MianBranch'
Show the picture in weibo
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
article model
article