高校首页
Merge branch 'master' of https://github.com/worldjingsai/code

Conflicts:
	app/controllers/univs.php