Merge branch 'gh-pages' into add-version-to-footer

diff --combined _includes/lesson_footer.html
index f9da0c9ea5ebf726f73c21acdbb5e2e1156ba65a,c6934e04b6b09f9661f80ddd47182c62638766e4..d7a16fd0391fd22ef702f8c0d52e06f8334ecb4c
--- 1/_includes/lesson_footer.html
--- 2/_includes/lesson_footer.html
+++ b/_includes/lesson_footer.html
@@@ -3,17 -3,25 +3,25 @@@
  {% endcomment %}
  <footer>
    <div class="row">
 -    <div class="col-md-6" align="left">
 +    <div class="col-md-6 copyright" align="left">
-       Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
        {% if site.carpentry == "swc" %}
+       Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
+       <a href="{{ site.carpentries_site }}">The Carpentries</a>
+         <br>
+         Copyright &copy; 2016–2018
        <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
        {% elsif site.carpentry == "dc" %}
+       Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
+       <a href="{{ site.carpentries_site }}">The Carpentries</a>
+         <br>
+         Copyright &copy; 2016–2018
        <a href="{{ site.dc_site }}">Data Carpentry</a>
        {% elsif site.carpentry == "lc" %}
+       Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
        <a href="{{ site.lc_site }}">Library Carpentry</a>
        {% endif %}
      </div>
 -    <div class="col-md-6" align="right">
 +    <div class="col-md-6 help-links" align="right">
        {% if page.source %}
        {% if page.source == "Rmd" %}
        <a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>
@@@ -31,10 -39,4 +39,10 @@@
        <a href="mailto:{{ site.email }}">Contact</a>
      </div>
    </div>
 +  <div class="row">
 +    <div class="col-md-12" align="center">
 +      Using <a href="https://github.com/swcarpentry/styles/">The Carpentries style</a> 
 +      version <a href="https://github.com/swcarpentry/styles/releases/tag/v9.4.0">9.4.0</a>.
 +    </div>
 +  </div>
  </footer>