From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:27:36 +0000 (+0000)
Subject: Merge github.com:fredhamster/feisty_meow
X-Git-Tag: 2.140.92~1^2^2^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=bdcc716c3d4ef7c405e580aa68ca10fb6c107800;hp=da39fcf691a8479cffd74b31e66425225b26fa1c;p=feisty_meow.git

Merge github.com:fredhamster/feisty_meow

funkistan
---

diff --git a/_config.yml b/_config.yml
new file mode 100644
index 00000000..c50ff38d
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-merlot
\ No newline at end of file