From 3a9bde665734a04b11c0a60f98f4c08073235884 Mon Sep 17 00:00:00 2001
From: Durel <aardurel@gmail.com>
Date: Tue, 26 Sep 2017 20:01:29 -0400
Subject: [PATCH] Tested a merge with an emacs commit!  Yay!

---
 README.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.txt b/README.txt
index 0866c66..c4e2c9b 100644
--- a/README.txt
+++ b/README.txt
@@ -1,2 +1,3 @@
 This is a test README.  You don't actually need to read it.
 Maybe you should...
+Here's a 3rd update