Merge branch 'master' into configimprovements

Conflicts:
	util/Strings.py

2 files changed, 10 insertions, 0 deletions

diff --git a/tests/TestConfigLoaders.py b/tests/TestConfigLoaders.py
new file mode 100644
index 0000000..6ea4f59
--- /dev/null
+++ b/tests/TestConfigLoaders.py
@@ -0,0 +1,10 @@
+import unittest
+class TestConfigLoaders(unittest.TestCase):
+    def setUp(self):
+        pass
+    def tearDown(self):
+        pass
+    def test_something(self):
+        pass
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/__init__.py