diff --git a/.gitignore b/.gitignore
index 75acef4..c3bebc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 Log*.txt
-/*.txt
+/*.tt
 input/*.txt
 d.cpp
\ No newline at end of file
diff --git a/2014.pdf b/2014.pdf
new file mode 100644
index 0000000..e69de29
diff --git a/contact.html b/contact.html
index 2794a97..c70aaee 100644
--- a/contact.html
+++ b/contact.html
@@ -1,2 +1,7 @@
 fsdvgwsasas
-vvcdfffd
\ No newline at end of file
+<<<<<<< HEAD
+vvcdfffd
+Vada Pau
+=======
+vvcdfffdss
+>>>>>>> 8b0ffeb213482cbe2921bd1a073a0114872695ca
diff --git a/halwa.txt b/halwa.txt
new file mode 100644
index 0000000..7655a2a
--- /dev/null
+++ b/halwa.txt
@@ -0,0 +1,4 @@
+OMG-1
+ss
+
+Added a line
\ No newline at end of file
diff --git a/hsd.pd b/hsd.pd
new file mode 100644
index 0000000..2f259b7
--- /dev/null
+++ b/hsd.pd
@@ -0,0 +1 @@
+s
\ No newline at end of file
diff --git a/ssd - Copy.txt b/ssd - Copy.txt
new file mode 100644
index 0000000..e69de29