merge
Merge branch 'master' of https://github.com/yfsun/website
fixed video thumbnail siize