上传图片单独写了class upload, 以前的ans_upload并没删除
Merge branch 'master' of https://github.com/etime/Edian

Conflicts:
	edian/application/controllers/chome.php
	edian/application/views/upload.php