Reverse merge to resolve layout updates

Conflicts:
	_layouts/bare.html

Author: jordanmccullough

README.md

@@ -24,7 +24,7 @@ The educational content exists in two top level directories:
 
 ## File Format
 
-The majority of the site materials are written in [Markdown](http://whatismarkdown.com), a [lightweight markup language](http://en.wikipedia.org/wiki/Lightweight_markup_language) supported in the GitHub web application user interface. There is a syntax guide to the original [Markdown format](http://daringfireball.net/projects/markdown/syntax) and also [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/).
+The majority of the site materials are written in [Markdown](http://whatismarkdown.com), a [lightweight markup language](http://en.wikipedia.org/wiki/Lightweight_markup_language) supported in the GitHub web application user interface. There is a syntax guide to the original [Markdown format](http://daringfireball.net/projects/markdown/syntax) and also [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/).  This repository is based on [Hydeslides](https://github.com/jordanmccullough/HydeSlides). That project offers additional information on the file and directory structure.
 
 ## Build
 

_layouts/bare.html

@@ -12,10 +12,11 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
     <link rel="stylesheet" media="all" href=
-    {% if page.theme %}
-      "../_stylesheets/page.css"
-    {% endif %}
-    "_stylesheets/page.css"
+      {% if page.theme == "home" %}
+        "_stylesheets/page.css"
+      {% else page.theme %}
+        "../_stylesheets/page.css"
+      {% endif %}
     />
 
     <link rel="stylesheet"