Merge branch 'gh-pages' of https://github.com/eelcodijkstra/pages-test into gh-pages

Conflicts:
_config.yml
resolve conflict