sd`
Merge branch 'master' of https://github.com/youkpan/hayoou_git

Conflicts:
	tupload1.php