From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:48:38 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow
X-Git-Tag: 2.140.92~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e4d756298fb49803f04ff8f246892b5cfd317944;hp=9e96951ac621c4ded75ea5738980978779ad648d;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow

updated local master
---

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
diff --git a/experiments/readme.txt b/experiments/readme.txt
new file mode 100644
index 00000000..06a8a18a
--- /dev/null
+++ b/experiments/readme.txt
@@ -0,0 +1,7 @@
+
+
+this is the testing lab where we work on new technologies.
+
+if something is still in here, it means it's not ready yet.
+
+
diff --git a/temp/mod1 b/temp/mod1
deleted file mode 100644
index 7aff7ce4..00000000
--- a/temp/mod1
+++ /dev/null
@@ -1 +0,0 @@
-arf
diff --git a/temp/mod2 b/temp/mod2
deleted file mode 100644
index 445727d3..00000000
--- a/temp/mod2
+++ /dev/null
@@ -1 +0,0 @@
-sdiuis
diff --git a/temp/mod3 b/temp/mod3
deleted file mode 100644
index 2f55af39..00000000
--- a/temp/mod3
+++ /dev/null
@@ -1 +0,0 @@
-farkle
diff --git a/temp/mod4 b/temp/mod4
deleted file mode 100644
index 2f55af39..00000000
--- a/temp/mod4
+++ /dev/null
@@ -1 +0,0 @@
-farkle
diff --git a/temp/mod5 b/temp/mod5
deleted file mode 100644
index 440c7d7c..00000000
--- a/temp/mod5
+++ /dev/null
@@ -1 +0,0 @@
-pustulingus
diff --git a/temp/mod6 b/temp/mod6
deleted file mode 100644
index 0f12a484..00000000
--- a/temp/mod6
+++ /dev/null
@@ -1 +0,0 @@
-muttgrabbers