From c2f9f9ae233a4883b62afe54e9e45e5eb262e6f1 Mon Sep 17 00:00:00 2001
From: pepperpepperpepper <pepper@scannerjammer.com>
Date: Mon, 16 Nov 2015 15:08:02 -0800
Subject: ready to merge to main branch

---
 to_merge/TODO | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 to_merge/TODO

(limited to 'to_merge/TODO')

diff --git a/to_merge/TODO b/to_merge/TODO
new file mode 100644
index 0000000..04f0396
--- /dev/null
+++ b/to_merge/TODO
@@ -0,0 +1,7 @@
+GET RUNNING LOCALLY
+run_module_examples_test (doesn't use server)
+merge these files
+the gallery
+email cuthbert
+laundry
+
-- 
cgit v1.2.3-70-g09d2