merged site
diff --git a/feed.xml~HEAD b/feed.xml~HEAD
new file mode 100644
index 0000000..bc07a2f
--- /dev/null
+++ b/feed.xml~HEAD
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.5.2">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2018-07-12T14:38:20+10:00</updated><id>http://localhost:4000/</id><subtitle></subtitle></feed>
\ No newline at end of file
diff --git a/feed.xml~bb8659b5367296177fc8790dd68d3c04fd493d35 b/feed.xml~bb8659b5367296177fc8790dd68d3c04fd493d35
new file mode 100644
index 0000000..0868c1d
--- /dev/null
+++ b/feed.xml~bb8659b5367296177fc8790dd68d3c04fd493d35
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.5.2">Jekyll</generator><link href="http://localhost:4000/feed.xml" rel="self" type="application/atom+xml" /><link href="http://localhost:4000/" rel="alternate" type="text/html" /><updated>2017-10-02T18:50:02+11:00</updated><id>http://localhost:4000/</id><subtitle></subtitle></feed>
\ No newline at end of file
