修改:         README.md
Merge branch 'master' of https://github.com/cjiejie/Graduation-Project

Conflicts:
	README.md

	删除:         README.md
	新文件:       static/imeage.png
	新文件:       static/show.html~
	新文件:       templates/ans.html~
	新文件:       templates/con.html~
	新文件:       templates/create.html~
	新文件:       templates/decode.html~
	新文件:       templates/download.html~
	新文件:       templates/formtest.html~
	新文件:       templates/show.html~
	新文件:       templates/test.html~