diff --git a/task-1/setup.sh b/task-1/setup.sh
old mode 100644
new mode 100755
index 4067509..2ebcb98
--- a/task-1/setup.sh
+++ b/task-1/setup.sh
@@ -1 +1,25 @@
-# Write your code here
\ No newline at end of file
+#!/usr/bin/env bash
+
+echo "Creating project..."
+git init project
+cd project/
+mkdir -p {resources,src/{database,profile}}
+touch README.md resources/{family-picture.jpg,icon.png,logo.png} settings.conf src/program.java
+git add .
+git commit -m "Initial commit"
+sleep 3
+echo "Setup project..."
+echo "Welcome to my project" > README.md
+rm -r src/profile
+rm resources/family-picture.jpg
+git commit -a -m "Project setup and removed personal file"
+sleep 3
+ls -l resources/
+echo "Setup javascript..."
+mv src/program.java src/program.js
+# [ERROR] "bash: !': event not found" if exclamation mark included, hence removal 
+echo "console.log('JavaScript works');" > src/program.js
+node src/program.js
+git commit -a -m "Setup javascript environment"
+ls -l $HOME/
+echo "All done!"
diff --git a/task-2/github-username.txt b/task-2/github-username.txt
index 5eabca7..46f0a8d 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
+jivvyjams