From 405cc77dc3d62bcf2e9594cae0cf264e36d4e74e Mon Sep 17 00:00:00 2001
From: budparr <budparr@gmail.com>
Date: Sat, 17 Nov 2018 21:07:02 -0500
Subject: [PATCH] Add additional files

---
 .gitattributes  | 2 ++
 contributing.md | 0
 2 files changed, 2 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 contributing.md

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e3461c8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+readme.md merge=union
\ No newline at end of file
diff --git a/contributing.md b/contributing.md
new file mode 100644
index 0000000..e69de29