Merge branch 'master' into develop

source/_views/default.twig

@@ -13,8 +13,8 @@
 
         {% include 'og' with { og: page.meta.og } %}
 
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
-        {% block styles %}{% endblock %}
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
+        {% block stylesheets '' %}
 
         {% for size in site.apple_touch_icon_sizes %}
             <link rel="apple-touch-icon" href="{{ site.avatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
@@ -62,6 +62,6 @@
             <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', '{{ site.google_analytics_tracking_id }}', 'auto'); ga('send', 'pageview');</script>
         {% endif %}
 
-        {% block scripts %}{% endblock %}
+        {% block scripts '' %}
     </body>
 </html>