diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 00000000000..b8da6a2ac66
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,21 @@
+name: cd
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+          
+      - name: Build app
+        run: scripts/buildprod.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000000..fd6dae7ca27
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,52 @@
+name: ci
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: go test
+        run: go test -cover ./... 
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+        
+      - name: Run gosec
+        run: gosec ./...
+
+  Style: # <--- TWÓJ NOWY JOB
+    name: Style
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      - name: Style 
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest 
+
+      - name: Run staticcheck
+        run: staticcheck ./...
+
+  
\ No newline at end of file
diff --git a/README.md b/README.md
index c2bec0368b7..76546328b9a 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![BADGE](https://github.com/<OWNER>/<REPOSITORY>/actions/workflows/<WORKFLOW_FILE>/badge.svg)
+
 # learn-cicd-starter (Notely)
 
 This repo contains the starter code for the "Notely" application for the "Learn CICD" course on [Boot.dev](https://boot.dev).
@@ -21,3 +23,5 @@ go build -o notely && ./notely
 *This starts the server in non-database mode.* It will serve a simple webpage at `http://localhost:8080`.
 
 You do *not* need to set up a database or any interactivity on the webpage yet. Instructions for that will come later in the course!
+
+Kacper's version of Boot.dev's Notely apdp.
\ No newline at end of file
diff --git a/internal/auth/get_api_key_test.go b/internal/auth/get_api_key_test.go
new file mode 100644
index 00000000000..153edce43b9
--- /dev/null
+++ b/internal/auth/get_api_key_test.go
@@ -0,0 +1,36 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	// Create headers with a correct Authorization header
+	headers := http.Header{}
+	headers.Set("Authorization", "ApiKey my-secret-key")
+
+	// Call the function we're testing
+	apiKey, err := GetAPIKey(headers)
+
+	// We expect NO error for a valid header
+	if err != nil {
+		t.Errorf("Expected no error, but got: %v", err)
+	}
+
+	// We expect the API key to be "my-secret-key"
+	if apiKey != "my-secret-key" {
+		t.Errorf("Expected 'my-secret-key', but got: %s", apiKey)
+	}
+	headers2 := http.Header{}
+	// Call the function we're testing
+	apiKey2, err2 := GetAPIKey(headers2)
+	// We expect an error for missing header
+	if err2 == nil {
+		t.Errorf("Expected an error for missing header, but got none")
+	}
+	if apiKey2 != "" {
+		t.Errorf("Expected empty API key for missing header, but got: %s", apiKey2)
+	}
+
+}
diff --git a/json.go b/json.go
index 1e6e7985e18..833b267d955 100644
--- a/json.go
+++ b/json.go
@@ -30,5 +30,10 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+	_, err = w.Write(dat) // W Go, ignorujemy liczbę bajtów za pomocą _
+	if err != nil {
+		// Jeśli zapis się nie uda, po prostu logujemy to. Klient i tak nie otrzyma nic więcej.
+		log.Println("error writing response:", err)
+		return
+	}
 }
diff --git a/main.go b/main.go
index 19d7366c5f7..02902178399 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/cors"
@@ -89,8 +90,11 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: 5 * time.Second,  // Dajemy 5 sekund na nagłówki
+		WriteTimeout:      5 * time.Second,  // Dajemy 5 sekund na zapis odpowiedzi
+		IdleTimeout:       60 * time.Second, // Dajmy 60 sekund na utrzymanie bezczynnego połączenia
 	}
 
 	log.Printf("Serving on port: %s\n", port)