adding morepath talk from yesterday

mattmakai · mattmakai · commit 5a3ea1a843bd · 2014-07-25T08:40:23.000+02:00
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-07-24T13:06:13Z</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-07-25T08:40:12Z</updated></feed>
diff --git a/other-web-frameworks.html b/other-web-frameworks.html
@@ -51,6 +51,12 @@ <h2>Falcon</h2>
 <h2>Morepath</h2>
 <p><a href="http://morepath.readthedocs.org/en/latest/">Morepath</a> is a micro web 
 framework that routes URLs directly to model code.</p>
+<ul>
+<li>Morepath's creator gave a 
+  <a href="https://www.youtube.com/watch?v=gyDKMAWPyuY">great talk on the motivation and structure for
+  the new framework</a> 
+  at EuroPython 2014.</li>
+</ul>
 <h2>web.py</h2>
 <p><a href="http://webpy.org/">web.py</a> is a Python web framework designed for simplicity
 in building web applications.</p>
diff --git a/source/content/pages/02-web-frameworks/0209-other-web-frameworks.markdown b/source/content/pages/02-web-frameworks/0209-other-web-frameworks.markdown
@@ -36,6 +36,11 @@ with web application speed as a top priority.
 [Morepath](http://morepath.readthedocs.org/en/latest/) is a micro web 
 framework that routes URLs directly to model code.
 
+* Morepath's creator gave a 
+  [great talk on the motivation and structure for
+  the new framework](https://www.youtube.com/watch?v=gyDKMAWPyuY) 
+  at EuroPython 2014.
+
 
 ## web.py
 [web.py](http://webpy.org/) is a Python web framework designed for simplicity

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-07-24T13:06:13Z</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-07-25T08:40:12Z</updated></feed>`