merged master

src/index.ts

@@ -1,7 +1,27 @@
 import { User } from "./types";
 
-const text = "This is the new text ";
+const text = "This is Michael's Answer";
+<<<<<<< HEAD
+fdsafd
+AudioBufferSourceNodedsaf
+DataTransferdsaf
+DataTransferfdsa
+FormDataasf
+DataTransferdsa
+FileSystemDirectoryEntryafd
+sa
+=======
 
+
+
+
+
+
+
+
+
+
+>>>>>>> master
 function getFromDb(): User[] {
   return [{
     name: "kfir",