diff --git a/task-1/setup.sh b/task-1/setup.sh
index 4067509..a40ea2c 100644
--- a/task-1/setup.sh
+++ b/task-1/setup.sh
@@ -1 +1,47 @@
-# Write your code here
\ No newline at end of file
+#!/bin/bash
+echo "Creating project..."
+mkdir project
+cd project
+git init
+touch README.md
+mkdir resources
+touch settings.conf
+mkdir src
+cd resources
+touch "family picture.jpg"
+touch icon.png
+touch logo.png
+cd ..
+cd src
+mkdir database
+mkdir profile
+touch program.java
+cd ..
+git add .
+git commit -m "Initial commit"
+git push
+sleep 3
+echo "Setup project..."
+echo "Welcome to my project" > README.md
+cd src
+rm -r profile
+cd ..
+cd resources
+rm "family picture.jpg"
+cd ..
+git add .
+git commit -m "write welcome text to README, remove profile directory , remove family_picture.jpg"
+git push
+sleep 3
+cd resources
+echo "Setup javascript..."
+mv program.java program.js
+echo "console.log('JavaScript works!');" > program.js
+node program.js
+cd ..
+git add .
+git commit -m "rename program.java to program.js , add log line to program.js"
+git push
+cd ~
+ls -la
+echo "All done!"
diff --git a/task-2/github-username.txt b/task-2/github-username.txt
deleted file mode 100644
index 5eabca7..0000000
--- a/task-2/github-username.txt
+++ /dev/null
@@ -1 +0,0 @@
-<paste here your github username>
\ No newline at end of file
diff --git a/task-2/halyna1995.txt b/task-2/halyna1995.txt
new file mode 100644
index 0000000..b89f3e0
--- /dev/null
+++ b/task-2/halyna1995.txt
@@ -0,0 +1 @@
+halyna1995