diff --git a/task-1/setup.sh b/task-1/setup.sh
index 4067509..3144c12 100644
--- a/task-1/setup.sh
+++ b/task-1/setup.sh
@@ -1 +1,42 @@
-# Write your code here
\ No newline at end of file
+echo "Creating project…"
+mkdir project
+git init
+touch project/README.md
+mkdir project/resources
+cd project/resources
+touch "family picture.jpg"
+touch icon.png
+touch logo.png
+cd ../
+touch settings.conf
+mkdir src
+cd src
+mkdir database
+mkdir profile
+touch program.java
+cd ../
+git add .
+git commit -m "initial commit"
+sleep 3
+echo "Setup project…"
+echo "Welcome to my project" >> README.md
+cd src
+rmdir profile
+cd ../
+cd resources 
+rm "family picture.jpg"
+cd ../
+git add .
+git commit -m "second commit"
+sleep 3
+ls resources
+echo "Setup javascript…"
+cd src
+mv program.java program.js
+echo "console.log('JavaScript works!');" >> program.js
+node program.js
+cd ../
+git add .
+git commit -m "third commit"
+ls $HOME
+echo "All done!"
\ No newline at end of file
diff --git a/task-2/github-username.txt b/task-2/github-username.txt
index 5eabca7..639d425 100644
--- a/task-2/github-username.txt
+++ b/task-2/github-username.txt
@@ -1 +1 @@
-<paste here your github username>
\ No newline at end of file
+atiqanaseer
\ No newline at end of file