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

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

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.
+
+