Merge branch 'gh-pages' of https://github.com/maban/christmas-recipes into gh-pages

Conflicts:
	_includes/foot.html

README.md

@@ -1,4 +1,16 @@
-christmas-recipes
+Christmas Recipes
 =================
 
-Nice things to cook around Christmas
+[View site, hosted on Github Pages](http://maban.github.io/christmas-recipes/)
+
+This is a demo site, accompanying a tutorial on 24 ways about [getting started with Git Pages and Jekyll](http://24ways.org/2013/get-started-with-github-pages/).
+
+Recipes and images are licensed under a [Creative Commons Attribution/Share-Alike License](http://creativecommons.org/licenses/by-sa/3.0/).
+
+## Usage
+
+Files can be edited on the [Github site](https://github.com/maban/christmas-recipes/), or locally. For full instructions on how to edit files locally using Jekyll, [follow the tutorial on 24 ways](http://24ways.org/2013/get-started-with-github-pages/).
+
+Recipes are formatted in [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
+
+Jekyll generates the raw files into the <i>_sites</i> folder, so do no edit any of the files in here.

_includes/foot.html

@@ -13,4 +13,4 @@
     
     </body>
 
-</html>
+</html>

_site/gingerbread.html

@@ -161,4 +161,4 @@
     
     </body>
 
-</html>
+</html>

_site/index.html

@@ -109,4 +109,4 @@
     
     </body>
 
-</html>
+</html>