Merge branch 'test' into test2

diff --git a/test2 b/test2
new file mode 100644
index 0000000..e26d85d
--- /dev/null
+++ b/test2
@@ -0,0 +1 @@
+Another test file.