首页修改
Merge branch 'master' of github.com:luxiangrong/kailian

Conflicts:
	css/style.css
重新编译