Merge branch 'gh-pages' into gh-pages

diff --combined bin/boilerplate/_episodes/01-introduction.md
index fcfdda1723816c698e09632d513f013a9bef2a1f,528cd07254705bbf154f69e363e69614d1c70f98..2e156c26da84c4e220e791201ee0fa37b5e6b5e6
--- 1/bin/boilerplate/_episodes/01-introduction.md
--- 2/bin/boilerplate/_episodes/01-introduction.md
+++ b/bin/boilerplate/_episodes/01-introduction.md
@@@ -3,12 -3,9 +3,13 @@@ title: "Introduction
  teaching: 0
  exercises: 0
  questions:
 -- "Key question"
 +- "Key question (FIXME)"
  objectives:
- - "First objective. (FIXME)"
 -- "First learning objective."
++- "First learning objective. (FIXME)"
  keypoints:
- - "First key point. (FIXME)"
 -- "First key point. Brief Answer to questions."
++- "First key point. Brief Answer to questions. (FIXME)"
  ---
 +FIXME
 +
 +{% include links.md %}
++

diff --combined bin/boilerplate/index.md
index 7fb812c29f6568dd0ebce12ebc10e864d5406074,81522f4d7b8589b71a83039fd0c1e0ffea8159ce..95ccdbdc5491c0babdbfad895d402036c51344fe
--- 1/bin/boilerplate/index.md
--- 2/bin/boilerplate/index.md
+++ b/bin/boilerplate/index.md
@@@ -1,13 -1,15 +1,17 @@@
  ---
  layout: lesson
- root: .  # Is the only page that don't follow the partner /:path/index.html
- permalink: index.html  # Is the only page that don't follow the partner /:path/index.html
+ root: .  # Is the only page that doesn't follow the pattern /:path/index.html
+ permalink: index.html  # Is the only page that doesn't follow the pattern /:path/index.html
  ---
  FIXME: home page introduction
  
+ <!-- this is an html comment -->
+ 
+ {% comment %} This is a comment in Liquid {% endcomment %}
+ 
  > ## Prerequisites
  >
  > FIXME
  {: .prereq}
 +
 +{% include links.md %}