Merging changes from other branches

diff --combined _includes/carpentries.html
index 1742b23d201b3d24193b8897d750664cfc7a3a98,c42bfcf2feef253fd63a7dab23ed521458fa8510..a0e0181fc7bf984d7b95a9c0b70e1230d6e350a4
--- 1/_includes/carpentries.html
--- 2/_includes/carpentries.html
+++ b/_includes/carpentries.html
@@@ -1,3 -1,6 +1,6 @@@
+ {% comment %}
+   General description of Software and Data Carpentry.
+ {% endcomment %}
  <div class="row">
    <div class="col-md-2" align="center">
      <a href="{{ site.swc_site }}"><img src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>
@@@ -23,19 -26,3 +26,19 @@@
      building on learners' existing knowledge to enable them to quickly apply skills learned to their own research.
    </div>
  </div>
 +<br/>
 +<div class="row">
 +  <div class="col-md-2" align="center">
 +    <a href="{{ site.lc_site }}"><img src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" /></a>
 +  </div>
 +  <div class="col-md-8">
 +    Library Carpentry is made by librarians to help librarians
 +    automate repetitive, boring, error-prone tasks;
 +    create, maintain and analyse sustainable and reusable data;
 +    work effectively with IT and systems colleagues;
 +    better understand the use of software in research;
 +    and much more.
 +    Library Carpentry was the winner of the 2016
 +    <a href="http://labs.bl.uk/British+Library+Labs+Awards">British Library Labs Teaching and Learning Award</a>.
 +  </div>
 +</div>

diff --combined _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>