diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..49c97c8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+# This file can always be added to, line additions should never collide.
+CHANGELOG.MD merge=union
+
+# These files are text and should be normalized (Convert crlf => lf)
+*.scala text
+*.MD text
+*.java text
+*.html text
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
new file mode 100644
index 0000000..8da3fcf
--- /dev/null
+++ b/CHANGELOG.MD
@@ -0,0 +1,5 @@
+# WdlTool Change Log
+
+0.1:
+=====
+