merging

diff --cc app/organization/magazine/urls.py
index 6eb9a9b73dbf17c9bbc7f4dc0ff1d876032c1576,cea975aeae69e65a4209ae4445dea0d2a8be0f9b..08d9963b403384b7e24938b2ab67852e58d185f1
--- 1/app/organization/magazine/urls.py
--- 2/app/organization/magazine/urls.py
+++ b/app/organization/magazine/urls.py
@@@ -1,16 -1,13 +1,28 @@@
  from __future__ import unicode_literals
  
++<<<<<<< HEAD
 +from django.conf.urls import patterns, include, url
 +from django.conf.urls.i18n import i18n_patterns
 +from django.contrib import admin
++=======
+ import django.views.i18n
+ from django.conf.urls import patterns, include, url
+ from django.conf.urls.i18n import i18n_patterns
++>>>>>>> 0f089a57b9482bec7a88f169e5d5fe2688c538c4
  
  from mezzanine.core.views import direct_to_template
  from mezzanine.conf import settings
  
++<<<<<<< HEAD
 +from organization.magazine.views import *
 +
 +
 +urlpatterns = [
 +    url(r'^article/$', ArticleListView.as_view(), name="magazine-article-list"),
 +    url(r'^article/detail/(?P<slug>.*)/$', ArticleDetailView.as_view(), name="magazine-article-detail"),
++=======
+ 
+ urlpatterns = [
+ 
++>>>>>>> 0f089a57b9482bec7a88f169e5d5fe2688c538c4
  ]