diff --git a/task-1/setup.sh b/task-1/setup.sh
index 4067509..6f1750a 100644
--- a/task-1/setup.sh
+++ b/task-1/setup.sh
@@ -1 +1,55 @@
-# Write your code here
\ No newline at end of file
+#!/bin/bash
+rm -rf project
+echo "Creating project…"
+mkdir project
+
+cd project
+git init
+touch README.md
+mkdir resources
+
+cd resources
+touch family picture.jpg
+touch icon.png
+touch logo.png
+
+cd ..
+touch settings.conf
+mkdir src
+
+cd src
+touch database
+touch 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
+rm profile
+
+cd ../resources
+rm family picture.jpg
+
+cd ..
+git add .
+git commit -m "modified README, deleted family picture, picture, profile"
+sleep 3
+
+cd 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 "renamed rogram.java to program.js, wrote code in program.js"
+ls ~
+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..30f1c71 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
+pavel-tisner
\ No newline at end of file