Merge branch '2016-06' of github.com:swcarpentry/styles into 2016-06
authorGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 00:46:42 +0000 (20:46 -0400)
committerGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 00:46:42 +0000 (20:46 -0400)

Trivial merge