Anna Debenham 0b45102d2e Merge branch 'gh-pages' of https://github.com/maban/christmas-recipes into gh-pages ... Conflicts: _includes/foot.html		2013-12-18 11:09:46 +00:00
..
foot.html	Merge branch 'gh-pages' of https://github.com/maban/christmas-recipes into gh-pages	2013-12-18 11:09:46 +00:00
head.html	Update styles	2013-12-17 23:50:34 +00:00
nav.html	Update the nav to include the homepage at the top	2013-12-15 18:34:33 +00:00