remote changes1
commit local1 minus generated html
Merge branch 'gh-pages' of https://github.com/lmaran/myblog into gh-pages