Merge branch 'master' into staging

source/_ga.html.erb

+<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','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-90661324-1', 'auto');
+  ga('send', 'pageview');
+</script>
\ No newline at end of file

source/index.html.haml

@@ -2,19 +2,19 @@
   %h2 Agile needs to evolve
   %p
-    The first attempt to bring structure into software development was <strong>Waterfall</strong>, but it was  extremely inflexible and rigid.
+    The first attempt to bring structure into software development was <strong>Waterfall</strong>, but it was extremely inflexible and rigid.
   %p
     People replaced Waterfall with <strong>Scrum</strong>. But some problems remained:<br/>
     %ul
       %li <strong>Scrum</strong> assumes you can estimate work accurately, which is not true in general.
-      %li As a result, it consumes a lot of time trying to plan and negotiate, and strains the relationship between developers and managers
+      %li As a result, it consumes a lot of time trying to plan and negotiate and strains the relationship between developers and managers
   %p
     <strong><a href="http://agilemanifesto.org" target="_blank">Agile</a></strong> fixed most of the problems of <strong>Scrum</strong>.
     %ul
       %li But it focuses only on the development process, not on setting requirements and doing deployments.
-      %li It doesn't work with large and/or distributed teams because verbal in-person communication doesn't scale
+      %li It doesn't work with large and distributed teams because verbal in-person communication doesn't scale
       %li Somehow best engineering practices ended up being not a part of Agile.
   =img("/images/evolution.png")
@@ -59,13 +59,13 @@
         Result oriented conversations
   %p
-    Moreover, most of enginireeng best practices arise naturally as an effect of Conversational Development principles application.
+    Moreover, most of engineering best practices arise naturally as an effect of Conversational Development principles application.
 %section#adopt
   %h2 Adopting Conversational Development
-  %p The first step on the path of adoption will be to realise your current situation. Take a look at the <a href="maturity-model">Maturity Model</a> to get an idea of your processes maturity, possible problems, and potential for growth.
+  %p The first step on the path of adoption will be to realize your current situation. Take a look at the <a href="maturity-model">Maturity Model</a> to get an idea of your processes maturity, possible problems, and potential for growth.
 %section#how-to-contribute
   %h2 How to contribute

source/layouts/layout.html.haml

@@ -25,6 +25,8 @@
       <meta property="og:image" content="images/evolution.png" />
+    = partial "ga"
+
     -#= javascript_include_tag "https://code.jquery.com/jquery-2.1.4.min.js"
     -#= javascript_include_tag  "all", "bootstrap.min", "likely"
@@ -65,4 +67,3 @@
     h1
       text-align: center
       font-size: 120px
-