diff --git a/usuarios.html b/usuarios.html
new file mode 100644
index 0000000..e79183e
--- /dev/null
+++ b/usuarios.html
@@ -0,0 +1,248 @@
+<!DOCTYPE html>
+<html lang="es">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Gestión de Usuarios - IntegraRepara</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://unpkg.com/lucide@latest"></script>
+    <style>.fade-in { animation: fadeIn 0.5s ease-in-out; } @keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }</style>
+</head>
+<body class="bg-gray-50 text-gray-800 font-sans antialiased">
+
+    <div class="flex h-screen overflow-hidden">
+        
+        <div id="sidebar-container" class="h-full"></div>
+
+        <div class="flex-1 flex flex-col overflow-hidden relative">
+            
+            <div id="header-container"></div>
+
+            <main class="flex-1 overflow-x-hidden overflow-y-auto bg-gray-50 p-8 fade-in">
+                
+                <h2 class="text-2xl font-bold text-gray-800 mb-8">Gestión de Equipo y Gremios</h2>
+                
+                <div class="flex flex-col gap-8 max-w-4xl mx-auto">
+                    
+                    <div class="w-full bg-white p-6 rounded-xl shadow-sm border border-gray-100">
+                        <div class="flex items-center gap-3 mb-4 text-blue-600">
+                            <i data-lucide="hammer" class="w-6 h-6"></i>
+                            <h3 class="text-lg font-bold text-gray-800">Gremios / Especialidades</h3>
+                        </div>
+                        <p class="text-sm text-gray-500 mb-4">Define las especialidades disponibles para tus operarios.</p>
+                        
+                        <div class="flex flex-col md:flex-row gap-6">
+                            <form onsubmit="addGuild(event)" class="flex gap-2 h-10 w-full md:w-1/2">
+                                <input type="text" id="newGuildName" placeholder="NUEVO GREMIO (EJ. LIMPIEZA)" required 
+                                       class="flex-1 px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500 outline-none text-sm uppercase">
+                                <button type="submit" class="bg-slate-800 text-white px-4 rounded-lg hover:bg-slate-700 font-bold">
+                                    <i data-lucide="plus" class="w-5 h-5"></i>
+                                </button>
+                            </form>
+                            
+                            <div class="w-full md:w-1/2 border rounded-lg bg-gray-50 p-2 max-h-40 overflow-y-auto space-y-2" id="guildsList">
+                                <p class="text-xs text-center text-gray-400 mt-2">Cargando gremios...</p>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="w-full bg-white p-6 rounded-xl shadow-sm border border-gray-100">
+                        <div class="flex items-center gap-3 mb-6 text-green-600">
+                            <i data-lucide="user-plus" class="w-6 h-6"></i>
+                            <h3 class="text-lg font-bold text-gray-800">Dar de Alta Nuevo Usuario</h3>
+                        </div>
+
+                        <form onsubmit="createUser(event)" class="space-y-6">
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                                <div class="space-y-4">
+                                    <div>
+                                        <label class="block text-xs font-bold text-gray-600 mb-1">Nombre Completo</label>
+                                        <input type="text" id="uName" required class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
+                                    </div>
+                                    <div>
+                                        <label class="block text-xs font-bold text-gray-600 mb-1">Correo Electrónico (Login)</label>
+                                        <input type="email" id="uEmail" required class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
+                                    </div>
+                                </div>
+
+                                <div class="space-y-4">
+                                    <div>
+                                        <label class="block text-xs font-bold text-gray-600 mb-1">Contraseña</label>
+                                        <input type="password" id="uPass" required class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
+                                    </div>
+                                    <div>
+                                        <label class="block text-xs font-bold text-gray-600 mb-1">Rol en el sistema</label>
+                                        <select id="uRole" class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none bg-white">
+                                            <option value="operario">Operario (Básico)</option>
+                                            <option value="facturacion">Facturación</option>
+                                            <option value="admin">Administrador</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="pt-2">
+                                <label class="block text-xs font-bold text-gray-600 mb-2">Asignar Gremios (Puede seleccionar varios)</label>
+                                <div class="p-4 border rounded-lg bg-gray-50 grid grid-cols-2 md:grid-cols-4 gap-3" id="guildsCheckboxArea">
+                                    <p class="text-xs text-gray-400">Crea gremios primero para asignarlos.</p>
+                                </div>
+                            </div>
+
+                            <div class="pt-4 border-t border-gray-100">
+                                <button type="submit" id="btnCreateUser" class="w-full bg-green-600 hover:bg-green-700 text-white font-bold py-3 rounded-lg transition-all shadow-lg shadow-green-500/30">
+                                    Crear Usuario
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+
+                </div>
+
+            </main>
+        </div>
+    </div>
+
+    <div id="toast" class="fixed bottom-5 right-5 bg-slate-800 text-white px-6 py-3 rounded-lg shadow-2xl transform translate-y-20 opacity-0 transition-all duration-300 z-50 flex items-center gap-3">
+        <span id="toastMsg">Mensaje</span>
+    </div>
+
+    <script src="js/layout.js"></script>
+
+    <script>
+        // Lógica movida desde configuracion.html
+        let availableGuilds = [];
+
+        document.addEventListener("DOMContentLoaded", () => {
+            const token = localStorage.getItem("token");
+            if (!token) { window.location.href = "index.html"; return; }
+            fetchGuilds();
+        });
+
+        // 1. GREMIOS
+        async function fetchGuilds() {
+            try {
+                const res = await fetch(`${API_URL}/guilds`, {
+                    headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` }
+                });
+                const data = await res.json();
+                if (data.ok) {
+                    availableGuilds = data.guilds;
+                    renderGuildsList();
+                    renderGuildsCheckboxes();
+                }
+            } catch (e) { console.error(e); }
+        }
+
+        async function addGuild(e) {
+            e.preventDefault();
+            const name = document.getElementById('newGuildName').value;
+            try {
+                const res = await fetch(`${API_URL}/guilds`, {
+                    method: 'POST',
+                    headers: { 
+                        "Content-Type": "application/json",
+                        "Authorization": `Bearer ${localStorage.getItem("token")}`
+                    },
+                    body: JSON.stringify({ name })
+                });
+                if (res.ok) {
+                    document.getElementById('newGuildName').value = "";
+                    fetchGuilds();
+                    showToast("Gremio añadido");
+                }
+            } catch (e) { showToast("Error al añadir", true); }
+        }
+
+        async function deleteGuild(id) {
+            if(!confirm("¿Borrar gremio?")) return;
+            try {
+                await fetch(`${API_URL}/guilds/${id}`, {
+                    method: 'DELETE',
+                    headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` }
+                });
+                fetchGuilds();
+            } catch (e) { console.error(e); }
+        }
+
+        function renderGuildsList() {
+            const list = document.getElementById('guildsList');
+            list.innerHTML = "";
+            availableGuilds.forEach(g => {
+                list.innerHTML += `
+                    <div class="flex justify-between items-center bg-white p-2 rounded border hover:bg-blue-50 transition shadow-sm">
+                        <span class="text-sm font-medium text-gray-700">${g.name}</span>
+                        <button onclick="deleteGuild(${g.id})" class="text-gray-400 hover:text-red-500"><i data-lucide="trash-2" class="w-4 h-4"></i></button>
+                    </div>
+                `;
+            });
+            if(window.lucide) lucide.createIcons();
+        }
+
+        function renderGuildsCheckboxes() {
+            const area = document.getElementById('guildsCheckboxArea');
+            if (availableGuilds.length === 0) {
+                area.innerHTML = '<p class="text-xs text-gray-400 col-span-4">No hay gremios creados.</p>';
+                return;
+            }
+            area.innerHTML = "";
+            availableGuilds.forEach(g => {
+                area.innerHTML += `
+                    <label class="flex items-center space-x-2 cursor-pointer p-2 hover:bg-green-50 rounded border border-transparent hover:border-green-200 transition">
+                        <input type="checkbox" value="${g.id}" class="guild-checkbox form-checkbox h-4 w-4 text-green-600 rounded border-gray-300 focus:ring-green-500">
+                        <span class="text-sm font-medium text-gray-700">${g.name}</span>
+                    </label>
+                `;
+            });
+        }
+
+        // 2. USUARIOS
+        async function createUser(e) {
+            e.preventDefault();
+            const btn = document.getElementById('btnCreateUser');
+            btn.disabled = true; btn.innerText = "Procesando...";
+
+            const selectedGuilds = Array.from(document.querySelectorAll('.guild-checkbox:checked')).map(cb => cb.value);
+
+            const data = {
+                fullName: document.getElementById('uName').value,
+                email: document.getElementById('uEmail').value,
+                password: document.getElementById('uPass').value,
+                role: document.getElementById('uRole').value,
+                guilds: selectedGuilds
+            };
+
+            try {
+                const res = await fetch(`${API_URL}/admin/users`, {
+                    method: 'POST',
+                    headers: { 
+                        "Content-Type": "application/json",
+                        "Authorization": `Bearer ${localStorage.getItem("token")}`
+                    },
+                    body: JSON.stringify(data)
+                });
+                const json = await res.json();
+                
+                if (json.ok) {
+                    showToast("✅ Usuario creado con éxito");
+                    e.target.reset();
+                    renderGuildsCheckboxes();
+                } else {
+                    showToast("❌ " + json.error, true);
+                }
+            } catch (e) {
+                showToast("Error de conexión", true);
+            } finally {
+                btn.disabled = false; btn.innerText = "Crear Usuario";
+            }
+        }
+
+        function showToast(msg, isError = false) {
+            const toast = document.getElementById('toast');
+            document.getElementById('toastMsg').innerText = msg;
+            toast.className = `fixed bottom-5 right-5 px-6 py-3 rounded-lg shadow-2xl transform transition-all duration-300 z-50 flex items-center gap-3 ${isError ? 'bg-red-600' : 'bg-slate-800'} text-white`;
+            toast.classList.remove('translate-y-20', 'opacity-0');
+            setTimeout(() => toast.classList.add('translate-y-20', 'opacity-0'), 3000);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
