diff --git a/.gitignore b/.gitignore
index 489bdd0..ca2c01a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,3 +159,7 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+<<<<<<< HEAD
+=======
+
+>>>>>>> 638a19d39481855fcdac76f9c3ec23c860db016d
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f34164c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Totem-Multimediale-Flask
+
+Pagina web per mostrare frasi aggiunte dagli utenti
\ No newline at end of file