changes
Merge remote-tracking branch 'refs/remotes/origin/master'
changes
what
I changed login.
Merge remote-tracking branch 'refs/remotes/origin/Annbranch'
我修改了锻炼、营养、补充的二级页面图片链接
Merge remote-tracking branch 'refs/remotes/origin/master'
更新后台图片滚动 banner 模块
补充页面分页取文章修改，还在修改中
Merge remote-tracking branch 'refs/remotes/origin/master'
added some ignored files at gitignore.
fff
delete
Merge remote-tracking branch 'refs/remotes/origin/master'
changes
后台图片添加
Merge remote-tracking branch 'refs/remotes/origin/master'
我修改了public.js和public.css，使登录下拉框兼容了ie7~ie8,具体修改地方，public.js中63/73行，public.css中很多行
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'