Merge branch '2016-06' of github.com:swcarpentry/styles into 2016-06
authorGreg Wilson <gvwilson@third-bit.com>
Sat, 2 Jul 2016 21:34:09 +0000 (17:34 -0400)
committerGreg Wilson <gvwilson@third-bit.com>
Sat, 2 Jul 2016 21:34:09 +0000 (17:34 -0400)

Trivial merge