fix merge bug
wrong write of img tag
change wrong white of img tag
Merge pull request #20 from zhangyaochun/master

fix merge bug