Merge branch 'master' into feature/move-styling-out-of-components

* master:
  Fmc
  changes to homepage

# Conflicts:
#	public/rss.xml

Author: jonwinstanley

md/blog/the-ultimate-tech-stack.md

@@ -4,13 +4,13 @@ published: true
 datePublished: 1590463136775
 author: Colin McDonnell
 authorTwitter: vriad
-authorPhoto: /img/colin_square_small.jpg
+authorPhoto: /profile.jpg
 tags:
   - Static Site Generators
   - React
   - Next.js
-thumbnailPhoto: /img/pancakes_thumb.jpeg
-bannerPhoto: /img/pancakes.jpeg
+thumbnailPhoto: /pancakes_thumb.jpeg
+bannerPhoto: /pancakes.jpeg
 canonicalUrl: https://vriad.com/essays/devii
 ---
 

package.json

@@ -55,4 +55,4 @@
     "favicons": "^6.1.0",
     "typescript": "^3.8.3"
   }
-}
+}

public/rss.xml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[My Awesome Blog]]></title><description><![CDATA[I write about code 'n stuff]]></description><link>https://alyssaphacker.com</link><image><url>https://alyssaphacker.com/icon.png</url><title>My Awesome Blog</title><link>https://alyssaphacker.com</link></image><generator>RSS for Node</generator><lastBuildDate>Thu, 29 Oct 2020 08:21:21 GMT</lastBuildDate><atom:link href="https://alyssaphacker.com/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Tue, 03 Mar 2020 04:00:00 GMT</pubDate><copyright><![CDATA[2020 Alyssa P. Hacker]]></copyright><language><![CDATA[en]]></language><managingEditor><![CDATA[alyssa@example.com]]></managingEditor><webMaster><![CDATA[alyssa@example.com]]></webMaster><ttl>60</ttl><item><title><![CDATA[Dan Abramov knows about Devii]]></title><description><![CDATA[<p>Dan Abramov knows about Devii!</p>
+=======
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[My Awesome Blog]]></title><description><![CDATA[I write about code 'n stuff]]></description><link>https://alyssaphacker.com</link><image><url>https://alyssaphacker.com/icon.png</url><title>My Awesome Blog</title><link>https://alyssaphacker.com</link></image><generator>RSS for Node</generator><lastBuildDate>Tue, 27 Oct 2020 03:08:58 GMT</lastBuildDate><atom:link href="https://alyssaphacker.com/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Tue, 03 Mar 2020 04:00:00 GMT</pubDate><copyright><![CDATA[2020 Alyssa P. Hacker]]></copyright><language><![CDATA[en]]></language><managingEditor><![CDATA[alyssa@example.com]]></managingEditor><webMaster><![CDATA[alyssa@example.com]]></webMaster><ttl>60</ttl><item><title><![CDATA[Dan Abramov knows about Devii]]></title><description><![CDATA[<p>Dan Abramov knows about Devii!</p>
+>>>>>>> master
 <blockquote>
   <p>Seems like it might be useful!
   — Dan Abramov, taken entirely out of context</p>