second try
Merge branch 'master' of github.com:wangaiyong/wangaiyong.github.io