空文件读取不乱码
测试更新
Merge branch 'master' of github.com:AirCoding/AirCoding

Conflicts:
	app/controllers/TestController.php