green-fox-academy · Csutkas · Mar 20, 2019 · Mar 20, 2019 · Mar 21, 2019 · Mar 21, 2019
diff --git a/about.html b/about.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title></title>
+    </head>
+    <body>
+
+    </body>
+</html>
diff --git a/branchfile.txt b/branchfile.txt
@@ -0,0 +1 @@
+"This is a new file in branch" 
diff --git a/hello.txt b/hello.txt
@@ -0,0 +1,25 @@
+hello
+
+ezt én is átírom
+
+meg mégegy sort
+
+=======
+
+szia Bela,
+ez az elso kollaboracionk.
+
+most csinaltam nehany valtoztatast ezzel a szoveggel.
+
+Geza
+
+=======
+
+ez megint valtoztatas
+
+=======
+
+2. modosíttttaaaaassssss
+
+
+>>>>>>> 654ca39d76996ba2baef08086d7f8398eac841d9
diff --git a/css/6.jpg → images/6.jpg b/css/6.jpg → images/6.jpg
diff --git a/sorted_index.html b/sorted_index.html
@@ -0,0 +1,10 @@
+        <meta charset="utf-8">
+        <title></title>
+    </body>
+    </head>
+    <body>
+    <head>
+
+<!DOCTYPE html>
+</html>
+<html>
diff --git a/task.txt b/task.txt
@@ -0,0 +1,4 @@
+1 setup the environment
+2 basic terminal operations
+3 redirections
+4 manipulations
diff --git a/css/7.jpg → temp_images/1.jpg b/css/7.jpg → temp_images/1.jpg
diff --git a/temp_images/2.jpg b/temp_images/2.jpg
diff --git a/temp_images/3.jpg b/temp_images/3.jpg
diff --git a/temp_images/4.jpg b/temp_images/4.jpg
diff --git a/temp_images/5.jpg b/temp_images/5.jpg