merged master

src/index.ts

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