修改了upload.html
some coding
add '*.bak.html' into ignore file
Merge branch 'master' into hua
合并'上传图片'功能