Merge branch 'master' of github.com:think2011/LocalResizeIMG

Conflicts:
	README.md
Merge branch 'master' of github.com:think2011/LocalResizeIMG