diff --git a/ex3_lab3.py b/ex3_lab3.py
new file mode 100644
index 00000000..08c2ec98
--- /dev/null
+++ b/ex3_lab3.py
@@ -0,0 +1,2 @@
+print("Test")
+print("")
\ No newline at end of file
diff --git a/hello.txt b/hello.txt
index 9ca13b8f..23301b44 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1 +1,2 @@
 Hello hello
+test abc
\ No newline at end of file
diff --git a/helloworld.py b/helloworld.py
new file mode 100644
index 00000000..019b5201
--- /dev/null
+++ b/helloworld.py
@@ -0,0 +1,8 @@
+print("Hello World!")
+print("Hello OSS Development")
+print("Hello CTU")
+<<<<<<< HEAD
+# print("Hello CTU - CIT")
+=======
+print("Hello CTU - CIT")
+>>>>>>> test_functions
diff --git a/helloworld.py.orig b/helloworld.py.orig
new file mode 100644
index 00000000..019b5201
--- /dev/null
+++ b/helloworld.py.orig
@@ -0,0 +1,8 @@
+print("Hello World!")
+print("Hello OSS Development")
+print("Hello CTU")
+<<<<<<< HEAD
+# print("Hello CTU - CIT")
+=======
+print("Hello CTU - CIT")
+>>>>>>> test_functions