resolve conflicts in _posts files from mojombo/blog-posts

site/_includes/top.html

@@ -4,6 +4,7 @@
   <meta charset="UTF-8">
   <title>{{ page.title }}</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
+  <link rel="alternate" type="application/rss+xml" title="Jekyll • Simple, blog-aware, static sites - Feed" href="/feed.xml" />
   <link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
   <link href='http://fonts.googleapis.com/css?family=Arizonia' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" href="{{ site.url }}/css/normalize.css" />

site/_posts/2013-05-06-jekyll-1-0-0-released.markdown

@@ -7,7 +7,7 @@ version: 1.0.0
 categories: [release]
 ---
 
-Hey! After many months of hard works by Jekyll's contributors, we're excited
+Hey! After many months of hard work by Jekyll's contributors, we're excited
 to announce the first major release of the project in a long while. v1.0.0 is
 finally here! While the list of improvements and bug fixes is [quite lengthy][history],
 here are the highlights (thanks to [@benbalter](http://twitter.com/BenBalter) for the

site/feed.xml

@@ -0,0 +1,36 @@
+---
+layout: none
+permalink: /feed.xml
+---
+
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+  xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:atom="http://www.w3.org/2005/Atom"
+  xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+  xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
+  >
+<channel>
+    <title xml:lang="en">Jekyll • Simple, blog-aware, static sites</title>
+    <atom:link type="application/atom+xml" href="http://jekyllrb.com/feed/" rel="self"/>
+    <link>http://jekyllrb.com</link>
+    <pubDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+    <lastBuildDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
+    <language>en-US</language>
+    <description>Transform your plain text into static websites and blogs.</description>
+    {% for post in site.posts %}
+    <item>
+        <title>{{ post.title }}</title>
+        <link>http://jekyllrb.com{{ post.url }}</link>
+        <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+        <dc:creator>{{ post.author }}</dc:creator>
+        {% for tag in post.tags %}<category>{{ tag | xml_escape }}</category>
+        {% endfor %}{% for cat in post.categories %}<category>{{ cat | xml_escape }}</category>
+        {% endfor %}<guid isPermaLink="false">{{ post.id }}</guid>
+        <description><![CDATA[ {{ post.content }} ]]></description>
+    </item>
+    {% endfor %}
+</channel>
+</rss>