Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages
authorFrançois Michonneau <francois.michonneau@gmail.com>
Mon, 18 Jun 2018 20:56:21 +0000 (16:56 -0400)
committerFrançois Michonneau <francois.michonneau@gmail.com>
Mon, 18 Jun 2018 20:56:21 +0000 (16:56 -0400)

Trivial merge