Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of github.com:lnhote/img_site