From: Mark Otto <otto@github.com>
Date: Sun, 22 Jun 2014 21:41:32 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b6688e2ee3c710bc83b0078b163a3d70c0ffa0a9;p=blog

Merge branch 'master' into gh-pages

Conflicts:
	_includes/head.html
---

b6688e2ee3c710bc83b0078b163a3d70c0ffa0a9
diff --cc _includes/head.html
index 3388fce,f8ae780..b827678
--- a/_includes/head.html
+++ b/_includes/head.html
@@@ -14,23 -14,13 +14,23 @@@
    </title>
  
    <!-- CSS -->
-   <link rel="stylesheet" href="/public/css/poole.css">
-   <link rel="stylesheet" href="/public/css/syntax.css">
+   <link rel="stylesheet" href="{{ site.baseurl }}public/css/poole.css">
+   <link rel="stylesheet" href="{{ site.baseurl }}public/css/syntax.css">
  
    <!-- Icons -->
-   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/public/apple-touch-icon-144-precomposed.png">
-                                  <link rel="shortcut icon" href="/public/favicon.ico">
+   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}public/apple-touch-icon-144-precomposed.png">
+   <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
  
    <!-- RSS -->
-   <link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
+   <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
 +
 +  <!-- Google Analytics -->
 +  <script>
 +    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 +    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 +    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 +    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 +    ga('create', 'UA-146052-15', 'getpoole.com');
 +    ga('send', 'pageview');
 +  </script>
  </head>