Merging changes from other branches

diff --cc _includes/carpentries.html
Simple merge

diff --cc _includes/workshop_footer.html
index 71a227ac8a1232ddba9a93bd6a2f6f54a5d7ef71,c618999e70a63557e1e9f0ae482b7f47061f0937..3ae63e6dc8f48dd341532e0fd95582e72e50c6e5
--- 1/_includes/workshop_footer.html
--- 2/_includes/workshop_footer.html
+++ b/_includes/workshop_footer.html
@@@ -1,13 -1,13 +1,16 @@@
+ {% comment %}
+   Footer for a standard workshop.
+ {% endcomment %}
  <footer>
    <div class="row">
 -    <div class="col-md-6" align="left">
 +    <div class="col-md-4" align="left">
        <h4><a href="{{ site.swc_site }}">Software Carpentry</a></h4>
      </div>
 -    <div class="col-md-6" align="right">
 +    <div class="col-md-4" align="right">
        <h4><a href="{{ site.dc_site }}">Data Carpentry</a></h4>
      </div>
 +    <div class="col-md-4" align="right">
 +      <h4><a href="{{ site.lc_site }}">Library Carpentry</a></h4>
 +    </div>
    </div>
  </footer>