Merge branch 'gh-pages' of https://github.com/laino/polwiki into gh-pages