分类页
数据库配置文件不再跟踪
Merge branch 'master' of github.com:guzeng/one

Conflicts:
	app/config/database.php
	app/views/home/header.php