From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:31:36 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=fa586d0d421b21b6390d32362c493ddce166fc64;hp=b6bf58bb1afa4b6c468239087cf14ed7d121d2e3;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow into dev
---

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