Merge branch 'styling-workshops' into 2016-06
authorGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 01:39:12 +0000 (21:39 -0400)
committerGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 01:39:12 +0000 (21:39 -0400)

Trivial merge