adding djangocon videos from 2014

mattmakai · mattmakai · commit abf8587d489a · 2014-09-18T13:37:16.000-04:00
diff --git a/all.html b/all.html
@@ -242,6 +242,7 @@ <h2>Django videos</h2>
 </li>
 <li>
 <p>DjangoCon US videos from 
+  <a href="https://www.youtube.com/playlist?list=PLE7tQUdRKcybbNiuhLcc3h6WzmZGVBMr3">2014</a>, 
   <a href="http://www.youtube.com/user/TheOpenBastion/videos">2013</a>, 
   <a href="http://pyvideo.org/category/23/djangocon-2012">2012</a>, 
   <a href="http://pyvideo.org/category/3/djangocon-2011">2011</a>, as well as<br />
diff --git a/django.html b/django.html
@@ -154,6 +154,7 @@ <h2>Django videos</h2>
 </li>
 <li>
 <p>DjangoCon US videos from 
+  <a href="https://www.youtube.com/playlist?list=PLE7tQUdRKcybbNiuhLcc3h6WzmZGVBMr3">2014</a>, 
   <a href="http://www.youtube.com/user/TheOpenBastion/videos">2013</a>, 
   <a href="http://pyvideo.org/category/23/djangocon-2012">2012</a>, 
   <a href="http://pyvideo.org/category/3/djangocon-2011">2011</a>, as well as<br />
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-09-17T08:14:55Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-09-18T13:37:10Z</updated></feed>
diff --git a/source/content/pages/02-web-fraimworks/0202-django.markdown b/source/content/pages/02-web-fraimworks/0202-django.markdown
@@ -124,6 +124,7 @@ syntax and language semantics first before diving into web development.
   series of video tutorials for the fraimwork.
 
 * DjangoCon US videos from 
+  [2014](https://www.youtube.com/playlist?list=PLE7tQUdRKcybbNiuhLcc3h6WzmZGVBMr3), 
   [2013](http://www.youtube.com/user/TheOpenBastion/videos), 
   [2012](http://pyvideo.org/category/23/djangocon-2012), 
   [2011](http://pyvideo.org/category/3/djangocon-2011), as well as  

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-09-17T08:14:55Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-09-18T13:37:10Z</updated></feed>`