Merge branch 'pr/13'

diff --combined 404.html
index d05ddb0abb07e050413ef2440f41fdea1be9371b,41190842d89b43e2cb0cc8805d3baf77e5583d18..9703ba819b75698f1260c1c97b3c81356f38cb96
--- 1/404.html
--- 2/404.html
+++ b/404.html
@@@ -1,10 -1,9 +1,10 @@@
  ---
  layout: default
  title: "404: Page not found"
 +permalink: 404.html
  ---
  
  <div class="page">
    <h1 class="page-title">404: Page not found</h1>
-   <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="/">Head back home</a> to try finding it again.</p>
+   <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.baseurl }}">Head back home</a> to try finding it again.</p>
  </div>