测试
Merge branch 'develop' of github.com:WangTe/huazhixun into develop

Conflicts:
	application/views/index.php
Merge branch 'develop' of github.com:WangTe/huazhixun into develop
修改header的logo显示问题
Merge branch 'develop' of https://github.com/WangTe/huazhixun into develop
Merge branch 'develop' of https://github.com/WangTe/huazhixun into develop
Merge branch 'develop' of https://github.com/WangTe/huazhixun into develop

Conflicts:
	application/views/header.php
Merge branch 'develop' of https://github.com/WangTe/huazhixun into develop
Merge branch 'develop' of https://github.com/WangTe/huazhixun into develop
修改教师显示页面