Merge branch 'main' of ssh://148.71.10.137:56036/AfonsoCMSousa/ACPlayer_Webpage

merge: Fixed merge conflic

app/music/page.tsx

@@ -0,0 +1,11 @@
+export default function Page() {
+    return (
+        <div style={{ padding: '20px', textAlign: 'center' }}>
+            <h1 style={{ fontSize: '42px' }}>Music Stream</h1>
+            <p>This is still a work in progress. Stay tuned for updates!</p>
+            <button style={{ marginTop: '20px', padding: '10px 20px', fontSize: '16px' }}>
+                <a href="https://discord.com/channels/1375797466066325596/1461402729661464576">Click here to find more!</a>
+            </button>
+        </div>
+    );
+}

components/navbar.tsx

@@ -28,7 +28,7 @@ export default function Navbar() {
           </Link>
 
           {/* Nav Links */}
-          <div className="flex items-center space-x-1">
+          <div className="flex items-center space-x-0">
             <Link 
               href="/"
               className={`px-4 py-2 text-sm font-medium transition-colors ${
@@ -79,6 +79,16 @@ export default function Navbar() {
             >
               LIVE
             </Link>
+            <Link 
+              href="/music"
+              className={`px-4 py-2 text-sm font-medium transition-colors ${
+                isActive('/about')
+                  ? 'text-white border-b-2 border-white' 
+                  : 'text-white/50 hover:text-white'
+              }`}
+            >
+              MUSIC
+            </Link>
             <a 
               href="https://discord.gg/nvuB8EvT9P" 
               target="_blank"