上传文件类
Merge branch 'master' of https://github.com/pmsun/MyClass

Conflicts:
	upload/Upload.php
	upload/upload.html
文件上传类