From 317a7c3c3ce9c65f72d9f04255d6350c47ad7bef Mon Sep 17 00:00:00 2001
From: Greg Wilson <gvwilson@third-bit.com>
Date: Sat, 20 Dec 2014 12:42:06 -0500
Subject: [PATCH] Merging changes from master

---
 LAYOUT.md     | 7 ++++---
 index.html    | 4 ++--
 index.md      | 4 ++--
 motivation.md | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/LAYOUT.md b/LAYOUT.md
index 2f4e97b..0b84101 100644
--- a/LAYOUT.md
+++ b/LAYOUT.md
@@ -141,8 +141,8 @@ we're trying to avoid those.
     ## Other Resources
 
     *   [Motivation](motivation.html)
-    *   [Reference Guide](reference.html)
-    *   [Next Steps](discussion.html)
+    *   [Reference](reference.html)
+    *   [Discussion](discussion.html)
     *   [Instructor's Guide](instructors.html)
 
 **Notes:**
@@ -232,7 +232,8 @@ be laid out like this:
 
     ---
     layout: slides
-    title: Why Make?
+    title: Lesson Title
+    subtitle: Motivation
     ---
     <section class="slide">
     ## Why This Topic?
diff --git a/index.html b/index.html
index 05466f4..3e8460d 100644
--- a/index.html
+++ b/index.html
@@ -40,8 +40,8 @@
 <h2 id="other-resources">Other Resources</h2>
 <ul>
 <li><a href="motivation.html">Motivation</a></li>
-<li><a href="reference.html">Reference Guide</a></li>
-<li><a href="discussion.html">Next Steps</a></li>
+<li><a href="reference.html">Reference</a></li>
+<li><a href="discussion.html">Discussion</a></li>
 <li><a href="instructors.html">Instructor's Guide</a></li>
 </ul>
         </div>
diff --git a/index.md b/index.md
index f113f1a..7079780 100644
--- a/index.md
+++ b/index.md
@@ -17,6 +17,6 @@ Paragraph of introductory material.
 ## Other Resources
 
 *   [Motivation](motivation.html)
-*   [Reference Guide](reference.html)
-*   [Next Steps](discussion.html)
+*   [Reference](reference.html)
+*   [Discussion](discussion.html)
 *   [Instructor's Guide](instructors.html)
diff --git a/motivation.md b/motivation.md
index e1d5198..4e906f6 100644
--- a/motivation.md
+++ b/motivation.md
@@ -1,6 +1,7 @@
 ---
 layout: slides
-title: Why Topic?
+title: Lesson Title
+subtitle: Motivation
 ---
 <section class="slide">
 ## Why Topic?
-- 
GitLab