merge
merge
完成了创建hdimage的servlet
Merge branch 'master' of github.com:JetMuffin/PicServer