From d777c4d6b11e4e76dc3dbeb995df972156b9ebaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20=C2=BBmo=2E=C2=AB=20Sauer?= <kontakt@phlow.net>
Date: Mon, 15 Sep 2014 21:40:23 +0200
Subject: [PATCH] Update

---
 _layouts/blog.html               | 7 ++++++-
 _posts/design/2014-07-10-page.md | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/_layouts/blog.html b/_layouts/blog.html
index 6fd13e1..81873d1 100644
--- a/_layouts/blog.html
+++ b/_layouts/blog.html
@@ -11,7 +11,12 @@ layout: default
 					<h2><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></h2>
 					<p>
 						{% if post.image.thumb %}<a href="{{ site.url }}{{ post.url }}" title="{{ post.title escape_once }}"><img src="{{ site.url }}/assets/img/{{ post.image.thumb }}" class="alignleft" width="150" height="150" alt="{{ page.title escape_once }}"></a>{% endif %}
-						{{ post.description }}
+
+						{% if post.meta_description %}{{ post.meta_description | strip_html | escape }}{% elsif post.description %}{{ post.description | strip_html | escape }}{% endif %}
+	
+
+
+						{{ post.description | strip_html | escape }}
 						<a href="{{ site.url }}{{ post.url }}" title="Read {{ post.title escape_once }}"><strong>Read more ›</strong></a>
 					</p>
 				</div><!-- /.small-12.columns -->
diff --git a/_posts/design/2014-07-10-page.md b/_posts/design/2014-07-10-page.md
index 6bd53b4..889c4ad 100644
--- a/_posts/design/2014-07-10-page.md
+++ b/_posts/design/2014-07-10-page.md
@@ -2,7 +2,7 @@
 layout: page
 title:  "Page Template"
 meta_description: "This is an example of a beautiful aligned page in the middle. There is no sidebar to distract the reader. The difference to the Post-Template is, that you find no meta-information at the bottom of the post."
-date:  2014-09-15 00:00:00
+date:  2014-09-10 00:00:00
 categories:
     - layout
     - design