fixed merge conflicts

Author: Abhat-93

.gitignore

@@ -1,6 +1,5 @@
 
 *.asv
-*.mat
 *.png
 *.fig
 *.pdf

.zenodo.json

@@ -0,0 +1,34 @@
+{
+    "description": "<p>Initial release</p>", 
+    "license": "other-open", 
+    "title": "ComputationalScienceLaboratory/DATools: v0.0.1", 
+    "version": "v0.0.1", 
+    "upload_type": "software", 
+    "publication_date": "2022-06-16", 
+    "creators": [
+        {
+            "affiliation": "Virginia Tech", 
+            "name": "Andrey A Popov"
+        }, 
+        {
+            "affiliation": "Virginia Tech", 
+            "name": "Abhinab Bhattacharjee"
+        }, 
+        {
+            "affiliation": "Virginia Tech", 
+            "name": "Amit N Subrahmanya"
+        }, 
+        {
+            "affiliation": "Virginia Tech", 
+            "name": "Adrian Sandu"
+        }
+    ], 
+    "access_right": "open", 
+    "related_identifiers": [
+        {
+            "scheme": "url", 
+            "identifier": "https://github.com/ComputationalScienceLaboratory/DATools/tree/v0.0.1", 
+            "relation": "isSupplementTo"
+        }
+    ]
+}

README.md

@@ -1,3 +1,5 @@
+[![DOI](https://zenodo.org/badge/269520040.svg)](https://zenodo.org/badge/latestdoi/269520040)
+
 A set of Data assimilation tools. Filter smoothers, ensemble and variational methods, localization, etc.
 
-An active work in progress.
+An active work in progress.