Merge pull request #7 from pattern-lab/feature/article-2col-fix

fixed 2col article to be 2 columns, and standard article to be 1

Author: EvanLovely

dist/_patterns/03-templates/03-article-2col.twig

@@ -1,4 +1,4 @@
-{% extends "templates-page-1col" %}
+{% extends "templates-page-2col" %}
 {% block main %}
     <article class="article">
         <header class="article-header">
@@ -10,3 +10,8 @@
     {% include "molecules-social-share" %}
     {% include "organisms-comment-thread" %}
 {% endblock %}
+
+{% block sidebar %}
+    {% include "organisms-related-posts" %}
+    {% include "organisms-recent-tweets" %}
+{% endblock %}

dist/_patterns/03-templates/03-article.twig

@@ -1,4 +1,4 @@
-{% extends "templates-page-2col" %}
+{% extends "templates-page-1col" %}
 {% block main %}
     <article class="article">
         <header class="article-header">
@@ -10,8 +10,3 @@
     {% include "molecules-social-share" %}
     {% include "organisms-comment-thread" %}
 {% endblock %}
-	
-{% block sidebar %}
-    {% include "organisms-related-posts" %}
-    {% include "organisms-recent-tweets" %}
-{% endblock %}

dist/_patterns/04-pages/02-article.twig

@@ -1 +1 @@
-{% include "templates-article" %}
+{% include "templates-article-2col" %}