..
Merge branch 'master' of github.com:WangTe/duikang

Conflicts:
	application/controllers/process.php
	application/models/zhuce_model.php
	application/views/login.php
	application/views/zhuce.php