From: Mark Otto <markdotto@gmail.com>
Date: Mon, 22 Jun 2015 00:11:51 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=84e75644dda47abc6a24f1bf332b863f518ab950;hp=-c;p=blog

Merge branch 'master' into gh-pages

Conflicts:
	_includes/head.html
---

84e75644dda47abc6a24f1bf332b863f518ab950
diff --combined _includes/head.html
index fc3ffb6,7437d19..71f25b2
--- a/_includes/head.html
+++ b/_includes/head.html
@@@ -3,7 -3,7 +3,7 @@@
    <link href="http://gmpg.org/xfn/11" rel="profile">
  
    <!-- Enable responsiveness on mobile devices-->
-   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
+   <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
    <title>
      {% if page.title == "Home" %}
@@@ -14,23 -14,12 +14,22 @@@
    </title>
  
    <!-- CSS -->
-   <link rel="stylesheet" href="{{ site.baseurl }}public/css/poole.css">
-   <link rel="stylesheet" href="{{ site.baseurl }}public/css/syntax.css">
+   <link rel="stylesheet" href="{{ site.baseurl }}/styles.css">
  
    <!-- Icons -->
-   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}public/apple-touch-icon-precomposed.png">
-   <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
+   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/public/apple-touch-icon-precomposed.png">
+   <link rel="shortcut icon" href="{{ site.baseurl }}/public/favicon.ico">
  
    <!-- RSS -->
-   <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ site.baseurl }}atom.xml">
+   <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" 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>