Merge origin/master

.env.example

@@ -1,4 +1,5 @@
 # Supabase Configuration
+<<<<<<< HEAD
 # Get these from your Supabase project settings: https://app.supabase.com
 NEXT_PUBLIC_SUPABASE_URL=https://your-project-id.supabase.co
 NEXT_PUBLIC_SUPABASE_ANON_KEY=your-supabase-anon-key-here
@@ -10,3 +11,16 @@ NEXT_PUBLIC_GA_TRACKING_ID=G-XXXXXXXXXX
 # Site Configuration
 # The public URL where your site is hosted (e.g., https://damjan-savic.com)
 NEXT_PUBLIC_SITE_URL=https://your-domain.com
+=======
+NEXT_PUBLIC_SUPABASE_URL=https://your-project.supabase.co
+NEXT_PUBLIC_SUPABASE_ANON_KEY=your-anon-key
+
+# Google Analytics (optional)
+NEXT_PUBLIC_GA_TRACKING_ID=G-XXXXXXXXXX
+
+# Site URL
+NEXT_PUBLIC_SITE_URL=https://damjan-savic.com
+
+# OpenAI API Key (for image generation)
+OPENAI_API_KEY=sk-your-api-key-here
+>>>>>>> origin/master