Merging changes from master

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?

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>

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)

motivation.md

 ---
 layout: slides
-title: Why Topic?
+title: Lesson Title
+subtitle: Motivation
 ---
 <section class="slide">
 ## Why Topic?