Merge branch 'master' into sass

diff --combined _layouts/post.html
index e6ce4621bf9b41e141d14527171daa21199595f3,17433f3ef436a6f4ba9d6ff3d615d3afc3ab589a..9ac13d44b0cbbb35568828ab3bcca533833aeb96
--- 1/_layouts/post.html
--- 2/_layouts/post.html
+++ b/_layouts/post.html
@@@ -4,7 -4,7 +4,7 @@@ layout: defaul
  
  <article class="post">
    <h1 class="post-title">{{ page.title }}</h1>
-   <time datetime="{{ page.date | date_to_xmlschema }}" class="page-date">{{ page.date | date_to_string }}</time>
+   <time datetime="{{ page.date | date_to_xmlschema }}" class="post-date">{{ page.date | date_to_string }}</time>
    {{ content }}
  </article>
  
@@@ -14,7 -14,7 +14,7 @@@
      {% for post in site.related_posts limit:3 %}
        <li>
          <h3>
 -          <a href="{{ site.baseurl }}{{ post.url }}">
 +          <a href="{{ site.baseurl }}/{{ post.url }}">
              {{ post.title }}
              <small><time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date_to_string }}</time></small>
            </a>