resize image
Merge branch 'master' of https://github.com/popfeng/popfeng.github.com