Merge pull request #3 from jianling/master

﻿添加聚合页面
Merge pull request #4 from jianling/master

remove reset.css to demo.css
bugfix