修改成单元测试
Merge branch 'master' of https://github.com/nearu/SE-Group1

Conflicts:
	application/controllers/test.php