diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4e1af0e..a0d458d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,70 +4,18 @@
     <bookmark url="file://$PROJECT_DIR$/war/index.html" line="85" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/war/test.jsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/war/usersAdminIndex.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/API_AppEngine_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/API_AppEngine_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment="Division de la aplicacion:&#10;&#10;El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados.">
+      <change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/model/Employee.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Lab09.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Lab09.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/access/AccessControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/access/AccessControllerAdd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/access/AccessControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/access/AccessControllerDelete.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/access/AccessControllerEdit.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/access/AccessControllerEdit.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/access/AccessControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/access/AccessControllerIndex.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/access/AccessControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/access/AccessControllerView.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/index.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/index.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/resources/ResourcesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerAdd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/resources/ResourcesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerDelete.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/resources/ResourcesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerIndex.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/resources/ResourcesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/resources/ResourcesControllerView.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/roles/RolesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerAdd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/roles/RolesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerDelete.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/roles/RolesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerIndex.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/roles/RolesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerView.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/services/ServicesControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerAdd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/services/ServicesControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerDelete.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/services/ServicesControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerIndex.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/services/ServicesControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/services/ServicesControllerView.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerAdd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/users/UsersControllerDelete.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerDelete.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/users/UsersControllerIndex.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerIndex.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/users/UsersControllerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/employee/users/UsersControllerView.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/model/Access.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Access.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/model/Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/add.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/edit.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/index.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Access/view.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Resources/add.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Resources/index.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Resources/view.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Roles/add.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Roles/view.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Users/index.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerAdd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerDelete.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerIndex.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerView.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerAdd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerDelete.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerIndex.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerView.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerAdd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerDelete.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerIndex.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerView.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/model/Access.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/model/Access.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/model/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/model/User.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/war/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/web.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/war/index.jsp" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/war/WEB-INF/classes/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -77,6 +25,7 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="ChangesViewManager" show_ignored="true" />
   <component name="DatabaseView">
     <option name="SHOW_INTERMEDIATE" value="true" />
     <option name="GROUP_DATA_SOURCES" value="true" />
@@ -97,10 +46,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="index.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp">
+        <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="349">
-              <caret line="89" column="20" lean-forward="true" selection-end-line="227" />
+            <state relative-caret-position="455">
+              <caret line="159" column="15" lean-forward="true" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="15" />
               <folding>
                 <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
               </folding>
@@ -108,11 +57,50 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="usersAdminIndex.jsp" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/war/usersAdminIndex.jsp">
+      <file leaf-file-name="EmployeesControllerView.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="657">
-              <caret line="122" column="28" lean-forward="true" selection-start-line="122" selection-start-column="28" selection-end-line="122" selection-end-column="28" />
+            <state relative-caret-position="355">
+              <caret line="38" column="50" selection-start-line="38" selection-start-column="42" selection-end-line="38" selection-end-column="50" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="add.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="576">
+              <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="view.jsp" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1332">
+              <caret line="143" column="25" selection-start-line="143" selection-start-column="25" selection-end-line="143" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="view.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="448">
+              <caret line="129" column="39" selection-start-line="129" selection-start-column="39" selection-end-line="129" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="add.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="473">
+              <caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -150,20 +138,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/controller/services/ServicesControllerAdd.java" />
-        <option value="$PROJECT_DIR$/src/controller/services/ServicesControllerDelete.java" />
-        <option value="$PROJECT_DIR$/src/controller/services/ServicesControllerView.java" />
-        <option value="$PROJECT_DIR$/src/controller/users/UsersControllerIndex.java" />
-        <option value="$PROJECT_DIR$/src/controller/index.java" />
-        <option value="$PROJECT_DIR$/src/controller/services/ServicesControllerIndex.java" />
-        <option value="$PROJECT_DIR$/src/controller/users/UsersControllerDelete.java" />
-        <option value="$PROJECT_DIR$/src/controller/users/UsersControllerView.java" />
-        <option value="$PROJECT_DIR$/src/controller/access/AccessControllerAdd.java" />
-        <option value="$PROJECT_DIR$/src/controller/access/AccessControllerDelete.java" />
-        <option value="$PROJECT_DIR$/src/controller/access/AccessControllerEdit.java" />
-        <option value="$PROJECT_DIR$/src/controller/access/AccessControllerIndex.java" />
-        <option value="$PROJECT_DIR$/war/css/Diseno.css" />
-        <option value="$PROJECT_DIR$/war/css/Elements.css" />
         <option value="$PROJECT_DIR$/src/model/User.java" />
         <option value="$PROJECT_DIR$/src/controller/access/AccessControllerView.java" />
         <option value="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" />
@@ -171,8 +145,6 @@
         <option value="$PROJECT_DIR$/war/test.jsp" />
         <option value="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerAdd.java" />
         <option value="$PROJECT_DIR$/src/controller/employee/roles/RolesControllerDelete.java" />
-        <option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
-        <option value="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" />
         <option value="$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp" />
         <option value="$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp" />
         <option value="$PROJECT_DIR$/war/WEB-INF/View/Users/view.jsp" />
@@ -201,6 +173,22 @@
         <option value="$PROJECT_DIR$/src/controller/employee/users/UsersControllerIndex.java" />
         <option value="$PROJECT_DIR$/war/WEB-INF/View/usersAdminIndex.jsp" />
         <option value="$PROJECT_DIR$/war/usersAdminIndex.jsp" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeeControllerDelete.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeeControllerIndex.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerView.java" />
+        <option value="$PROJECT_DIR$/src/model/Employee.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerIndex.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employee/EmployeesControllerAdd.java" />
+        <option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
+        <option value="$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java" />
+        <option value="$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java" />
+        <option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp" />
+        <option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp" />
+        <option value="$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp" />
       </list>
     </option>
   </component>
@@ -265,7 +253,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
               <item name="employee" type="462c0819:PsiDirectoryNode" />
-              <item name="users" type="462c0819:PsiDirectoryNode" />
+              <item name="employees" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
@@ -285,6 +273,43 @@
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
               <item name="View" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Lab09" type="462c0819:PsiDirectoryNode" />
+              <item name="war" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="View" type="462c0819:PsiDirectoryNode" />
+              <item name="Employees" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Lab09" type="462c0819:PsiDirectoryNode" />
+              <item name="war" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="View" type="462c0819:PsiDirectoryNode" />
+              <item name="Services" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="Lab09" type="58d84e3e:PackageViewProjectNode" />
+              <item name="Lab09" type="616d4139:PackageViewModuleNode" />
+            </path>
+            <path>
+              <item name="Lab09" type="58d84e3e:PackageViewProjectNode" />
+              <item name="Lab09" type="616d4139:PackageViewModuleNode" />
+              <item name="controller" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="Lab09" type="58d84e3e:PackageViewProjectNode" />
+              <item name="Lab09" type="616d4139:PackageViewModuleNode" />
+              <item name="META-INF" type="1f31426a:PackageElementNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -354,27 +379,6 @@
         </subPane>
       </pane>
       <pane id="AndroidView" />
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="Lab09" type="58d84e3e:PackageViewProjectNode" />
-              <item name="Lab09" type="616d4139:PackageViewModuleNode" />
-            </path>
-            <path>
-              <item name="Lab09" type="58d84e3e:PackageViewProjectNode" />
-              <item name="Lab09" type="616d4139:PackageViewModuleNode" />
-              <item name="controller" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="Lab09" type="58d84e3e:PackageViewProjectNode" />
-              <item name="Lab09" type="616d4139:PackageViewModuleNode" />
-              <item name="META-INF" type="1f31426a:PackageElementNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -389,7 +393,7 @@
     <property name="project.structure.last.edited" value="Problems" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
+    <property name="settings.editor.selected.configurable" value="reference.idesettings.quicklists" />
     <property name="settings.editor.splitter.proportion" value="0.21668363" />
   </component>
   <component name="RecentsManager">
@@ -560,6 +564,7 @@
       <workItem from="1531449031990" duration="4443000" />
       <workItem from="1531489105867" duration="9960000" />
       <workItem from="1531523398201" duration="5772000" />
+      <workItem from="1531582003807" duration="5201000" />
     </task>
     <task id="LOCAL-00001" summary="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura.">
       <created>1528408256446</created>
@@ -743,11 +748,18 @@
       <option name="project" value="LOCAL" />
       <updated>1530996178036</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="Division de la aplicacion:&#10;&#10;El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados.">
+      <created>1531582200223</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1531582200223</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="180787000" />
+    <option name="totallyTimeSpent" value="185988000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -780,12 +792,13 @@
       <window_info id="Image Layers" order="4" />
       <window_info anchor="bottom" id="Java Enterprise" order="9" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32925338" />
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32808718" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32808718" />
       <window_info id="Persistence" order="2" sideWeight="0.5018226" side_tool="true" weight="0.14578834" />
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49816403" visible="true" weight="0.14902808" />
       <window_info id="Web" order="7" sideWeight="0.50060755" side_tool="true" weight="0.24961714" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32808718" />
       <window_info anchor="right" id="Google Cloud Storage" order="4" />
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info id="Favorites" order="6" sideWeight="0.501836" side_tool="true" weight="0.14902808" />
@@ -795,12 +808,47 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32808718" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -829,7 +877,8 @@
     <MESSAGE value="Funcionalidad lista al 100%:&#10;&#10;-El método que revisa el acceso a un servlet se encuentra en el método checkPermission en controller.access.AccessControllerView&#10;-Ahora agregaré cosas al Front-end." />
     <MESSAGE value="Mejoras generales" />
     <MESSAGE value="Arreglo de errores" />
-    <option name="LAST_COMMIT_MESSAGE" value="Arreglo de errores" />
+    <MESSAGE value="Division de la aplicacion:&#10;&#10;El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados." />
+    <option name="LAST_COMMIT_MESSAGE" value="Division de la aplicacion:&#10;&#10;El sector inicial esta dirigido a los clientes, mientras que las herramientos coma el CRUD solo son solo para empleados." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -837,83 +886,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/controller/employee/services/ServicesControllerView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
-          <caret line="75" column="112" selection-start-line="75" selection-start-column="112" selection-end-line="75" selection-end-column="112" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/js/materialize.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1356">
-          <caret line="2683" column="13" selection-start-line="2683" selection-start-column="13" selection-end-line="2683" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1666">
-          <caret line="98" column="35" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/controller/index.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="36" selection-start-line="36" selection-end-line="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/Desktop/Universidad/Java EE/API AppEngine 1.9/servlet-api.jar!/javax/servlet/http/HttpServletRequestWrapper.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/Desktop/Universidad/Java EE/API AppEngine 1.9/appengine-api-1.0-sdk-1.9.63.jar!/com/google/apphosting/utils/servlet/ParseBlobUploadFilter.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="265">
-          <caret line="125" column="25" selection-start-line="125" selection-start-column="25" selection-end-line="125" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/Desktop/Universidad/Java EE/API AppEngine 1.9/servlet-api.jar!/javax/servlet/http/HttpServletRequest.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-326">
-          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/css/DisenoTemp.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="790">
-          <caret line="79" column="1" lean-forward="true" selection-start-line="79" selection-start-column="1" selection-end-line="79" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/js/GlobalJs.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="4" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/controller/employee/services/ServicesControllerIndex.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/test.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="9" selection-start-line="9" selection-end-line="220" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/controller/employee/roles/RolesControllerDelete.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="425">
@@ -935,46 +907,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="609">
-          <caret line="201" column="24" selection-start-line="201" selection-start-column="24" selection-end-line="201" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="635">
-          <caret line="140" column="87" lean-forward="true" selection-start-line="140" selection-start-column="71" selection-end-line="140" selection-end-column="87" />
-          <folding>
-            <element signature="n#style#0;n#a#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="128" column="68" lean-forward="true" selection-start-line="128" selection-start-column="52" selection-end-line="128" selection-end-column="68" />
-          <folding>
-            <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#style#0;n#a#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="32" selection-start-line="32" selection-end-line="92" selection-end-column="6" />
-          <folding>
-            <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#style#0;n#a#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Users/add.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="673">
@@ -1216,18 +1148,156 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Roles/index.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="349">
-          <caret line="89" column="20" lean-forward="true" selection-end-line="227" />
+        <state relative-caret-position="1496">
+          <caret line="89" column="20" selection-end-line="227" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="32" lean-forward="true" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/model/Employee.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+          <folding>
+            <element signature="e#997#998#0" expanded="true" />
+            <element signature="e#1024#1025#0" expanded="true" />
+            <element signature="e#1063#1064#0" expanded="true" />
+            <element signature="e#1095#1096#0" expanded="true" />
+            <element signature="e#1127#1128#0" expanded="true" />
+            <element signature="e#1155#1156#0" expanded="true" />
+            <element signature="e#1196#1197#0" expanded="true" />
+            <element signature="e#1230#1231#0" expanded="true" />
+            <element signature="e#1262#1263#0" expanded="true" />
+            <element signature="e#1290#1291#0" expanded="true" />
+            <element signature="e#1331#1332#0" expanded="true" />
+            <element signature="e#1365#1366#0" expanded="true" />
+            <element signature="e#1393#1394#0" expanded="true" />
+            <element signature="e#1419#1420#0" expanded="true" />
+            <element signature="e#1454#1455#0" expanded="true" />
+            <element signature="e#1484#1485#0" expanded="true" />
+            <element signature="e#1518#1519#0" expanded="true" />
+            <element signature="e#1547#1548#0" expanded="true" />
+            <element signature="e#1591#1592#0" expanded="true" />
+            <element signature="e#1627#1628#0" expanded="true" />
+            <element signature="e#1657#1658#0" expanded="true" />
+            <element signature="e#1707#1708#0" expanded="true" />
+            <element signature="e#1746#1747#0" expanded="true" />
+            <element signature="e#1782#1783#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="204" lean-forward="true" selection-start-line="204" selection-end-line="204" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/usersAdminIndex.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1173">
+          <caret line="110" selection-start-line="110" selection-end-line="110" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/index.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1683">
+          <caret line="100" column="89" selection-start-line="100" selection-start-column="89" selection-end-line="100" selection-end-column="89" />
           <folding>
             <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/war/usersAdminIndex.jsp">
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/add.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="657">
-          <caret line="122" column="28" lean-forward="true" selection-start-line="122" selection-start-column="28" selection-end-line="122" selection-end-column="28" />
+        <state relative-caret-position="473">
+          <caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerAdd.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="687">
+          <caret line="92" column="38" selection-start-line="92" selection-start-column="38" selection-end-line="92" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerDelete.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="49" column="38" selection-start-line="49" selection-start-column="38" selection-end-line="49" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerIndex.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="615">
+          <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/index.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="455">
+          <caret line="159" column="15" lean-forward="true" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="15" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Services/view.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="129" column="39" selection-start-line="129" selection-start-column="39" selection-end-line="129" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/controller/employee/employees/EmployeesControllerView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="355">
+          <caret line="38" column="50" selection-start-line="38" selection-start-column="42" selection-end-line="38" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/add.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="576">
+          <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/View/Employees/view.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1332">
+          <caret line="143" column="25" selection-start-line="143" selection-start-column="25" selection-end-line="143" selection-end-column="25" />
         </state>
       </provider>
     </entry>
diff --git a/src/controller/employee/employees/EmployeesControllerAdd.java b/src/controller/employee/employees/EmployeesControllerAdd.java
new file mode 100644
index 0000000..d8aa6b6
--- /dev/null
+++ b/src/controller/employee/employees/EmployeesControllerAdd.java
@@ -0,0 +1,102 @@
+package controller.employee.employees;
+
+import java.io.IOException;
+
+import javax.jdo.PersistenceManager;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+
+import com.google.appengine.api.datastore.Key;
+import com.google.appengine.api.datastore.KeyFactory;
+import controller.PMF;
+import controller.employee.access.AccessControllerView;
+import controller.employee.users.UsersControllerView;
+import model.Employee;
+
+@SuppressWarnings("serial")
+public class EmployeesControllerAdd extends HttpServlet {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException{
+
+        try{
+
+            if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
+                PersistenceManager pm = PMF.get().getPersistenceManager();
+
+                System.out.println("Request URI Add ->" + request.getRequestURI());
+
+                String action = request.getParameter("action");
+
+                if (action == null)
+                    action = "";
+
+                if (action.equals("create")){
+
+                    String name = request.getParameter("Name");
+                    String phone = request.getParameter("Phone");
+                    String email = request.getParameter("Email");
+                    Long dni = Long.parseLong(request.getParameter("Dni"));
+                    String userCreatorKey = request.getParameter("userId");
+
+                    Employee employee = new Employee (name, phone, email,dni,true,userCreatorKey);
+
+                    request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Employee created successfully.\"}");
+
+                    pm.makePersistent(employee);
+
+
+                } else if (action.equals("update")){
+
+                    Key k = KeyFactory.stringToKey(request.getParameter("key"));
+
+                    Employee employee = pm.getObjectById(Employee.class,k);
+
+                    employee.setName(request.getParameter("Name"));
+                    employee.setDni(Long.parseLong(request.getParameter("Dni")));
+                    employee.setEmail(request.getParameter("Email"));
+                    employee.setPhone(request.getParameter("Phone"));
+
+                    pm.close();
+
+                    request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Employee updated successfully.\"}");
+
+                } else if (action.equals("redirect")){
+
+                    HttpSession sesion= request.getSession();
+                    RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Employees/add.jsp");
+                    request.setAttribute("User",UsersControllerView.getUser(sesion.getAttribute("userID").toString()));
+                    dispatcher.forward(request, response);
+
+                }
+
+                pm.close();
+                try{
+                    response.sendRedirect("/e/employees");
+                }
+                //Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect.
+                catch (IllegalStateException e){
+                    System.err.println("IllegalStateException: There was a double redirect.");
+                }
+
+            } else {
+
+                request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to create/update a Employee.\"}");
+                response.sendRedirect("/e/users");
+
+            }
+
+        } catch (NullPointerException e){
+            response.sendRedirect("/e/users");
+        }
+
+
+    }
+
+    public void doPost (HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException{
+        doGet(request, response);
+    }
+}
\ No newline at end of file
diff --git a/src/controller/employee/employees/EmployeesControllerDelete.java b/src/controller/employee/employees/EmployeesControllerDelete.java
new file mode 100644
index 0000000..2c623e2
--- /dev/null
+++ b/src/controller/employee/employees/EmployeesControllerDelete.java
@@ -0,0 +1,60 @@
+package controller.employee.employees;
+
+import com.google.appengine.api.datastore.Key;
+import com.google.appengine.api.datastore.KeyFactory;
+import controller.PMF;
+import controller.employee.access.AccessControllerView;
+import model.Employee;
+
+import javax.jdo.JDOObjectNotFoundException;
+import javax.jdo.PersistenceManager;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@SuppressWarnings("serial")
+public class EmployeesControllerDelete extends HttpServlet {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        try{
+
+            if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
+
+                PersistenceManager pm = PMF.get().getPersistenceManager();
+
+                String employeeKey = request.getParameter("employeeKey");
+
+                try{
+                    Key k = KeyFactory.stringToKey(employeeKey);
+                    Employee employee = pm.getObjectById(Employee.class, k);
+
+                    pm.deletePersistent(employee);
+
+                    request.getSession().setAttribute("serverResponse","{\"color\": \"#26a69a\",\"response\":\"Employee deleted successfully.\"}");
+                } catch (JDOObjectNotFoundException e){
+                    System.err.println("Exception catched -> " + e.getMessage());
+                }
+
+                pm.close();
+
+                response.sendRedirect("/e/employees");
+
+            } else {
+                request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to delete a Employee.\"}");
+                response.sendRedirect("/e/users");
+            }
+
+
+        } catch (NullPointerException e){
+            response.sendRedirect("/e/users");
+        }
+
+
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException{
+        doGet(request, response);
+    }
+
+}
\ No newline at end of file
diff --git a/src/controller/employee/employees/EmployeesControllerIndex.java b/src/controller/employee/employees/EmployeesControllerIndex.java
new file mode 100644
index 0000000..bf18e39
--- /dev/null
+++ b/src/controller/employee/employees/EmployeesControllerIndex.java
@@ -0,0 +1,63 @@
+package controller.employee.employees;
+
+import controller.employee.access.AccessControllerView;
+import controller.employee.users.UsersControllerView;
+import model.User;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+import static controller.employee.employees.EmployeesControllerView.getAllEmployees;
+
+public class EmployeesControllerIndex extends HttpServlet {
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        try{
+
+            if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
+
+                //Se usa para revisar si hay una sesion activa
+                HttpSession sesion= request.getSession();
+
+                //Intenta hallar una sesion activa
+                try{
+                    User user = UsersControllerView.getUser(sesion.getAttribute("userID").toString());
+                    if (user == null) throw new NullPointerException("UsersControllerIndex: El usuario recibido es nulo.");
+
+                    request.setAttribute("User",user);
+                    request.setAttribute("EmployeesList",getAllEmployees());
+                    request.setAttribute("serverResponse",sesion.getAttribute("serverResponse"));
+                    sesion.setAttribute("serverResponse","!");
+                    RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Employees/index.jsp");
+                    dispatcher.forward(request,response);
+
+                }
+                //Si no la encuentra, redirige a la pagina inicial.
+                catch (Exception e){
+                    System.err.println("UserControllerIndex: Error catched. " + e.getMessage());
+                    response.getWriter().println("<html><head><script>window.location.replace(\"../\")</script></head></html>");
+                }
+
+            } else {
+                request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to access /employees.\"}");
+                response.sendRedirect("/e/users");
+            }
+
+        } catch (NullPointerException e){
+            response.sendRedirect("/e/users");
+        }
+
+
+    }
+
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        doPost(req, resp);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/controller/employee/employees/EmployeesControllerView.java b/src/controller/employee/employees/EmployeesControllerView.java
new file mode 100644
index 0000000..67cef2d
--- /dev/null
+++ b/src/controller/employee/employees/EmployeesControllerView.java
@@ -0,0 +1,107 @@
+package controller.employee.employees;
+
+import com.google.appengine.api.datastore.Key;
+import com.google.appengine.api.datastore.KeyFactory;
+import controller.PMF;
+import controller.employee.access.AccessControllerView;
+import controller.employee.users.UsersControllerView;
+import model.Employee;
+
+import javax.jdo.PersistenceManager;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@SuppressWarnings("serial")
+public class EmployeesControllerView extends HttpServlet {
+
+    @SuppressWarnings("unchecked")
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        try{
+
+            if (AccessControllerView.checkPermission(request.getSession().getAttribute("userID").toString(),request.getRequestURI())){
+
+                String action = request.getParameter("action");
+
+                if (action == null)
+                    action = "";
+
+                PersistenceManager pm = PMF.get().getPersistenceManager();
+
+                if (action.equals("editRedirect")) {
+                    RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Employees/view.jsp");
+
+                    request.setAttribute("User",UsersControllerView.getUser(request.getSession().getAttribute("userID").toString()));
+                    request.setAttribute("Employee",getEmployee(request.getParameter("employeeKey")));
+
+                    request.setAttribute("editAllowed",true);
+                    request.setAttribute("action","Edit");
+
+                    try{
+                        dispatcher.forward(request,response);
+                    } catch (javax.servlet.ServletException e){
+                        e.printStackTrace();
+                    }
+
+                }
+                else if (action.equals("viewRedirect")) {
+                    RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Employees/view.jsp");
+
+                    request.setAttribute("User",UsersControllerView.getUser(request.getSession().getAttribute("userID").toString()));
+                    request.setAttribute("Employee",getEmployee(request.getParameter("employeeKey")));
+
+                    request.setAttribute("editAllowed",false);
+                    request.setAttribute("action","View");
+
+                    try{
+                        dispatcher.forward(request,response);
+                    } catch (javax.servlet.ServletException e){
+                        e.printStackTrace();
+                    }
+
+                }
+                //Si no se encontró acción, regresa al inicio
+                else {
+                    response.getWriter().println("<html><head><script>window.location.replace(\"../\");</script><body></body></html>");
+                }
+
+                pm.close();
+
+            } else {
+                request.getSession().setAttribute("serverResponse","{\"color\": \"red\",\"response\":\"You don\\'t have permission to view/edit a Employee.\"}");
+                response.sendRedirect("/e/users");
+            }
+
+        } catch (NullPointerException e){
+            response.sendRedirect("/e/users");
+        }
+
+    }
+
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        doGet(req, resp);
+    }
+
+    @SuppressWarnings("unchecked")
+    static List<Employee> getAllEmployees(){
+        PersistenceManager pm = controller.PMF.get().getPersistenceManager();
+        List<Employee> employees = (List<Employee>) pm.newQuery("select from " + Employee.class.getName()).execute();
+        pm.close();
+        return employees;
+    }
+
+    private static Employee getEmployee(String key){
+        PersistenceManager pm = PMF.get().getPersistenceManager();
+
+        Key k = KeyFactory.stringToKey(key);
+        Employee employee = pm.getObjectById(Employee.class,k);
+
+        pm.close();
+        return employee;
+    }
+
+}
\ No newline at end of file
diff --git a/src/model/Employee.java b/src/model/Employee.java
new file mode 100644
index 0000000..54100bc
--- /dev/null
+++ b/src/model/Employee.java
@@ -0,0 +1,102 @@
+package model;
+
+import javax.jdo.annotations.*;
+import com.google.appengine.api.datastore.Key;
+import com.google.appengine.api.datastore.KeyFactory;
+import controller.employee.users.UsersControllerView;
+
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+public class Employee {
+
+    @PrimaryKey
+    @Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY)
+    private Key key;
+
+    @Persistent
+    private String name;
+
+    @Persistent
+    private String phone;
+
+    @Persistent
+    private String email;
+
+    @Persistent
+    private Long dni;
+
+    @Persistent
+    private boolean status;
+
+    @Persistent
+    private String creatorUserId;
+
+    public Employee(String name, String phone, String email, Long dni,boolean status,String creatorUserKey) {
+        this.name = name;
+        this.phone = phone;
+        this.email = email;
+        this.dni = dni;
+        this.status = status;
+        this.creatorUserId = creatorUserKey;
+    }
+
+
+    /*Getters and Setters*/
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Long getDni() {
+        return dni;
+    }
+    public void setDni(Long dni) {
+        this.dni = dni;
+    }
+
+    public boolean getStatus() {
+        return status;
+    }
+    public void setStatus(boolean status) {
+        this.status = status;
+    }
+
+    public String getKey() {
+        return KeyFactory.keyToString(key);
+    }
+
+    public String getCreatorUserId(){
+        return creatorUserId;
+    }
+
+    public String getCreatorUserName(){
+        String name;
+        try{
+            name = UsersControllerView.getUser(creatorUserId).getName();
+        } catch (Exception e){
+            name = "<span style=\"color: red; font-weight: bold\">The User doesn't exists.</span>";
+        }
+        return name;
+    }
+
+    /*To String*/
+    public String toString(){
+        return "Name: " + name + "\n Dni: " + dni + "\n Email: " + email + "\n Phone: " + phone + ".\n";
+    }
+
+}
\ No newline at end of file
diff --git a/war/WEB-INF/View/Employees/add.jsp b/war/WEB-INF/View/Employees/add.jsp
new file mode 100644
index 0000000..bd04717
--- /dev/null
+++ b/war/WEB-INF/View/Employees/add.jsp
@@ -0,0 +1,131 @@
+<%@ page import="model.User" %>
+<%@ page import="java.util.List" %>
+<%@ page import="model.Role" %><%--
+  Created by IntelliJ IDEA.
+  User: Fernando
+  Date: 07/06/2018
+  Time: 16:39
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<% User user = (User) request.getAttribute("User"); %>
+<html lang="es">
+<head>
+    <title>Add a Employee - Hotel Services</title>
+
+    <meta name="google-signin-client_id" content="746890482047-c734fgap3p3vb6bdoquufn60bsh2p8l9.apps.googleusercontent.com">
+
+    <script src="https://apis.google.com/js/platform.js" async defer></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link type="text/css" rel="stylesheet" href="../../css/Diseno.css">
+    <link type="text/css" rel="stylesheet" href="../../css/materialize.min.css">
+    <link type="text/css" rel="stylesheet" href="../../css/Elements.css">
+
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+
+    <script src="../../js/GlobalJs.js" async defer></script>
+
+</head>
+<body>
+
+<nav class="nav-extended" style="background-color: #3f51b5">
+    <div class="nav-wrapper" style="max-height: 64px">
+        <a class="whiteLink hide-on-small-only" href="/" style="padding: 0 0 0 20px; font-family: 'Product Sans', Roboto, serif; font-size: xx-large">Hotel Services</a>
+        &nbsp;&nbsp;Empleados
+        <div class="right valign-wrapper" style="padding: 0 0 0 10px; cursor: pointer; min-width: 150px;" onclick="changeUserOptions()">
+
+            <span style="min-width: 80px;">
+                <%= user.getName()%>
+            </span>
+            <img src="<%=user.getImgUrl()%>" alt="" class="circle responsive-img" style="padding: 5px" width="50px">
+            <i class="material-icons">arrow_drop_down</i>
+
+            <div id="userOptions" style="background-color: white; border:solid 2px #67c9b3; position: absolute;
+                width: auto; display: none;">
+                <ul style="color: black">
+
+                    <li style="padding: 0 5px;">
+                        <a style="color: black" onclick="postRedirect('./users/view',{action:'closeSession'})">Log Out</a>
+                    </li>
+
+                    <li id="cerrar" style="padding: 0 5px; cursor: pointer">
+                        <i class="small material-icons">arrow_drop_up</i>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+        <ul id="nav-mobile" class="right hide-on-med-and-down">
+            <li style="max-height: 62px">
+                <a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
+                    <svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
+                        <title id="simpleicons-github-icon">
+                            GitHub icon
+                        </title>
+                        <path fill="white" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12">
+                        </path>
+                    </svg>
+                </a>
+            </li>
+            <li><a class="whiteLink" href="../roles">Administración de Usuarios</a></li>
+            <li class="active"><a class="whiteLink active" href="../services">Administración de recursos</a></li>
+            <li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
+            <li>|</li>
+        </ul>
+
+        <!--<div class="dropdown hide-on-large-only" style="padding: 0 10px; font-weight: bold" onclick="toggleDropdown()">Show Services</div>
+        <div id="dropdownContent">
+            <a href="#" onclick="postRedirect('./roles')">Roles</a>
+            <a href="#" style="background-color: lightgray">Users</a>
+            <a onclick="postRedirect('./resources')">Resources</a>
+            <a onclick="postRedirect('./access')">Access</a>
+        </div>-->
+
+    </div>
+    <div class="nav-content" style="background-color: #3949a3">
+        <ul class="tabs tabs-transparent">
+            <li class="tab"><a href="../services">Servicios</a></li>
+            <li class="tab active"><a class="active" href="../employees">Otros</a></li>
+        </ul>
+    </div>
+</nav>
+
+<div class="container">
+    <br />
+    <span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Create an Employee</span>
+    <br />
+    <br />
+
+    <form method="post" action="./add">
+        <input name="action" value="create" type="hidden">
+
+        Name of the Employee:<br>
+        <input name="Name" placeholder="Name" required=""><br>
+
+        Dni of the Employee:<br>
+        <input name="Dni" placeholder="Dni" pattern="[0-9]{8}" title="Ingrese su numero de DNI(8 digitos)" required=""><br>
+
+        Email of the Employee:<br>
+        <input name="Email" placeholder="Email" pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$" title="caracteres@nombre del dominio" required=""><br>
+
+        Phone of the Employee:<br>
+        <input name="Phone" placeholder="Phone" type="number" pattern="[0-9]{6,9}" title="Ingrese un numero de 6 o 9 digitos" required=""><br>
+
+        <input type="hidden" name="userId" value="<%= user.getId() %>">
+
+        <button class="btn waves-effect waves-light indigo darken-1" type="submit" name="action">Create
+            <i class="material-icons right">send</i>
+        </button>
+
+    </form>
+    <hr />
+    <br />
+    <a href="../employees" class="waves-effect waves-light btn whiteLink indigo darken-1"><i class="material-icons left">arrow_back</i>Go Back</a>
+
+
+</div>
+
+</body>
+</html>
diff --git a/war/WEB-INF/View/Employees/index.jsp b/war/WEB-INF/View/Employees/index.jsp
new file mode 100644
index 0000000..5368e82
--- /dev/null
+++ b/war/WEB-INF/View/Employees/index.jsp
@@ -0,0 +1,171 @@
+<%@ page import="model.User" %>
+<%@ page import="java.util.List" %>
+<%@ page import="model.Service" %>
+<%@ page import="model.Employee" %><%--
+  Created by IntelliJ IDEA.
+  User: Fernando
+  Date: 07/06/2018
+  Time: 16:39
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%  User usuario = (User) request.getAttribute("User");
+    List<Employee> employeeList = (List<Employee>) request.getAttribute("EmployeesList");
+    String serverResponse = (String) request.getAttribute("serverResponse");
+    if (serverResponse == null) serverResponse = "!";
+%>
+<html lang="es">
+<head>
+    <title>Empleados - Hotel Services</title>
+
+    <meta name="google-signin-client_id" content="746890482047-c734fgap3p3vb6bdoquufn60bsh2p8l9.apps.googleusercontent.com">
+
+    <script src="https://apis.google.com/js/platform.js" async defer></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link type="text/css" rel="stylesheet" href="../../css/Diseno.css">
+    <link type="text/css" rel="stylesheet" href="../../css/materialize.min.css">
+    <link type="text/css" rel="stylesheet" href="../../css/Elements.css?v=2">
+
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+
+    <script src="../../js/GlobalJs.js" async defer></script>
+
+</head>
+<body>
+
+<nav class="nav-extended" style="background-color: #3f51b5">
+    <div class="nav-wrapper" style="max-height: 64px">
+        <a class="whiteLink hide-on-small-only" href="/" style="padding: 0 0 0 20px; font-family: 'Product Sans', Roboto, serif; font-size: xx-large">Hotel Services</a>
+        &nbsp;&nbsp;Empleados
+        <div class="right valign-wrapper" style="padding: 0 0 0 10px; cursor: pointer; min-width: 150px;" onclick="changeUserOptions()">
+
+            <span style="min-width: 80px;">
+                <%= usuario.getName()%>
+            </span>
+            <img src="<%=usuario.getImgUrl()%>" alt="" class="circle responsive-img" style="padding: 5px" width="50px">
+            <i class="material-icons">arrow_drop_down</i>
+
+            <div id="userOptions" style="background-color: white; border:solid 2px #67c9b3; position: absolute;
+                width: auto; display: none;">
+                <ul style="color: black">
+
+                    <li style="padding: 0 5px;">
+                        <a style="color: black" onclick="postRedirect('./users/view',{action:'closeSession'})">Log Out</a>
+                    </li>
+
+                    <li id="cerrar" style="padding: 0 5px; cursor: pointer">
+                        <i class="small material-icons">arrow_drop_up</i>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+        <ul id="nav-mobile" class="right hide-on-med-and-down">
+            <li style="max-height: 62px">
+                <a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
+                    <svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
+                        <title id="simpleicons-github-icon">
+                            GitHub icon
+                        </title>
+                        <path fill="white" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12">
+                        </path>
+                    </svg>
+                </a>
+            </li>
+            <li><a class="whiteLink" href="./roles">Administración de Usuarios</a></li>
+            <li class="active"><a class="whiteLink active" href="./services">Administración de recursos</a></li>
+            <li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
+            <li>|</li>
+        </ul>
+
+        <!--<div class="dropdown hide-on-large-only" style="padding: 0 10px; font-weight: bold" onclick="toggleDropdown()">Show Services</div>
+        <div id="dropdownContent">
+            <a href="#" onclick="postRedirect('./roles')">Roles</a>
+            <a href="#" style="background-color: lightgray">Users</a>
+            <a onclick="postRedirect('./resources')">Resources</a>
+            <a onclick="postRedirect('./access')">Access</a>
+        </div>-->
+
+    </div>
+    <div class="nav-content" style="background-color: #3949a3">
+        <ul class="tabs tabs-transparent">
+            <li class="tab"><a href="./services">Servicios</a></li>
+            <li class="tab active"><a class="active" href="#">Empleados</a></li>
+        </ul>
+    </div>
+</nav>
+
+<div class="container">
+    <br />
+    <span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Empleados</span>
+    <br />
+    <br />
+
+    <%if (!serverResponse.equals("!")){ %>
+
+    <div id="serverResponse">
+        <div style="margin: 10px"></div>
+    </div>
+    <script>
+        var respDiv = document.getElementById("serverResponse");
+
+        var responseData = JSON.parse('<%=serverResponse%>');
+
+        respDiv.style.backgroundColor = responseData["color"];
+        respDiv.innerHTML = "<div style=\"margin: 10px\">" + responseData["response"] + "</div>";
+
+        respDiv.style.maxHeight = "500px";
+        setTimeout(function () {
+            respDiv.style.maxHeight = "0";
+        },1500);
+
+    </script>
+
+    <% } %>
+    <br />
+    <br />
+
+    <a class="waves-effect waves-light btn whiteLink indigo darken-1" onclick="postRedirect('/e/employees/add',{action:'redirect'})"><i class="material-icons left">add</i>Create</a>
+    <br />
+    <br />
+
+    <table class="striped responsive-table">
+        <thead>
+        <tr>
+            <td>Nombre</td>
+            <td>DNI</td>
+            <td>Email</td>
+            <td>Teléfono</td>
+            <td>Creado Por</td>
+            <td>Actions</td>
+        </tr>
+        </thead>
+
+        <tbody>
+
+        <% for (Employee employee: employeeList) {%>
+        <tr>
+            <td><%= employee.getName()%></td>
+            <td><%= employee.getDni() %></td>
+            <td><%= employee.getEmail() %></td>
+            <td><%= employee.getPhone() %></td>
+            <td><%= employee.getCreatorUserName() %></td>
+            <td>
+                <a class="postLink" onclick="postRedirect('./employees/view',{action:'viewRedirect',employeeKey:'<%=employee.getKey()%>'})">View</a>
+                | <a class="postLink" onclick="postRedirect('./employees/view',{action:'editRedirect',employeeKey:'<%=employee.getKey()%>'})">Edit</a>
+                | <a class="postLink" onclick="postRedirect('./employees/delete',{employeeKey:'<%=employee.getKey()%>'})">Delete</a></td>
+        </tr>
+        <% } %>
+
+        </tbody>
+
+
+
+    </table>
+
+</div>
+
+</body>
+</html>
diff --git a/war/WEB-INF/View/Employees/view.jsp b/war/WEB-INF/View/Employees/view.jsp
new file mode 100644
index 0000000..efe0f33
--- /dev/null
+++ b/war/WEB-INF/View/Employees/view.jsp
@@ -0,0 +1,150 @@
+<%@ page import="model.User" %>
+<%@ page import="model.Employee" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Fernando
+  Date: 07/06/2018
+  Time: 16:39
+  To change this template use File | Settings | File Templates.
+--%>
+<%  Employee employee = (Employee) request.getAttribute("Employee");
+    User usuario = (User) request.getAttribute("User");
+    boolean editAllowed = (Boolean) request.getAttribute("editAllowed");
+    String action = (String) request.getAttribute("action");%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title><%=action%> a Service - Hotel Services</title>
+
+    <meta name="google-signin-client_id" content="746890482047-c734fgap3p3vb6bdoquufn60bsh2p8l9.apps.googleusercontent.com">
+
+    <script src="https://apis.google.com/js/platform.js" async defer></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link type="text/css" rel="stylesheet" href="../../css/Diseno.css">
+    <link type="text/css" rel="stylesheet" href="../../css/materialize.min.css">
+    <link type="text/css" rel="stylesheet" href="../../css/Elements.css">
+
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+
+    <script src="../../js/GlobalJs.js" async defer></script>
+</head>
+<body>
+
+<nav class="nav-extended" style="background-color: #3f51b5">
+    <div class="nav-wrapper" style="max-height: 64px">
+        <a class="whiteLink hide-on-small-only" href="/" style="padding: 0 0 0 20px; font-family: 'Product Sans', Roboto, serif; font-size: xx-large">Hotel Services</a>
+        &nbsp;&nbsp;Empleados
+        <div class="right valign-wrapper" style="padding: 0 0 0 10px; cursor: pointer; min-width: 150px;" onclick="changeUserOptions()">
+
+            <span style="min-width: 80px;">
+                <%= usuario.getName()%>
+            </span>
+            <img src="<%=usuario.getImgUrl()%>" alt="" class="circle responsive-img" style="padding: 5px" width="50px">
+            <i class="material-icons">arrow_drop_down</i>
+
+            <div id="userOptions" style="background-color: white; border:solid 2px #67c9b3; position: absolute;
+                width: auto; display: none;">
+                <ul style="color: black">
+
+                    <li style="padding: 0 5px;">
+                        <a style="color: black" onclick="postRedirect('./users/view',{action:'closeSession'})">Log Out</a>
+                    </li>
+
+                    <li id="cerrar" style="padding: 0 5px; cursor: pointer">
+                        <i class="small material-icons">arrow_drop_up</i>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+        <ul id="nav-mobile" class="right hide-on-med-and-down">
+            <li style="max-height: 62px">
+                <a href="https://github.com/Grupo-PW2/Lab08" target="_blank" style="max-height: 62px">
+                    <svg style="width: 32px; height: 32px; margin: 20px 0" aria-labelledby="simpleicons-github-icon" roleKey="img" xmlns="http://www.w3.org/2000/svg">
+                        <title id="simpleicons-github-icon">
+                            GitHub icon
+                        </title>
+                        <path fill="white" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12">
+                        </path>
+                    </svg>
+                </a>
+            </li>
+            <li><a class="whiteLink" href="../roles">Administración de Usuarios</a></li>
+            <li class="active"><a class="whiteLink active" href="../services">Administración de recursos</a></li>
+            <li><a class="whiteLink" href="">Reportes de Ingresos</a></li>
+            <li>|</li>
+        </ul>
+
+        <!--<div class="dropdown hide-on-large-only" style="padding: 0 10px; font-weight: bold" onclick="toggleDropdown()">Show Services</div>
+        <div id="dropdownContent">
+            <a href="#" onclick="postRedirect('./roles')">Roles</a>
+            <a href="#" style="background-color: lightgray">Users</a>
+            <a onclick="postRedirect('./resources')">Resources</a>
+            <a onclick="postRedirect('./access')">Access</a>
+        </div>-->
+
+    </div>
+    <div class="nav-content" style="background-color: #3949a3">
+        <ul class="tabs tabs-transparent">
+            <li class="tab active"><a class="active" href="../services">Servicios</a></li>
+            <li class="tab"><a href="./users">Otros</a></li>
+        </ul>
+    </div>
+</nav>
+
+<div class="container">
+    <br />
+    <span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif"><%=action%> a Service</span>
+    <br />
+    <br />
+
+    <% if (editAllowed) {%>
+
+    <form action="./add" method="post">
+
+        <input name="key" value="<%=employee.getKey()%>" type="hidden">
+        <input name="action" value="update" type="hidden">
+
+        Name of the Service:<br />
+        <input name="Name" value="<%=employee.getName()%>" placeholder="Name" required><br/>
+
+        DNI of the Employee:<br />
+        <input name="Dni" type="number" min="0" required placeholder="Price" value="<%= employee.getDni() %>"><br />
+
+        Email of the Service:<br />
+        <input name="Email" type="email" placeholder="Description" required value="<%= employee.getEmail() %>"><br />
+
+        Phone of the Employee:<br>
+        <input name="Phone" placeholder="Phone" type="number" pattern="[0-9]{6,9}" title="Ingrese un numero de 6 o 9 digitos"
+               required="" value="<%= employee.getPhone() %>">
+
+        <button class="btn waves-effect waves-light indigo darken-1" type="submit" name="action">Edit
+            <i class="material-icons right">send</i>
+        </button>
+
+    </form>
+
+    <% } else {%>
+
+
+    <div style="font-size: x-large">
+        Name: <%= employee.getName() %><br />
+        Dni: <%= employee.getDni() %><br />
+        Email: <%= employee.getEmail() %><br />
+        Created by: <a style="cursor:pointer;" onclick="postRedirect('/e/users/view',{action:'viewRedirect',userID:'<%=employee.getCreatorUserId()%>'})"><%= employee.getCreatorUserName() %></a>
+    </div>
+
+
+    <% } %>
+
+    <hr />
+    <br />
+    <a href="../employees" class="waves-effect waves-light btn whiteLink indigo darken-1"><i class="material-icons left">arrow_back</i>Go Back</a>
+
+
+</div>
+
+</body>
+</html>
diff --git a/war/WEB-INF/View/Services/add.jsp b/war/WEB-INF/View/Services/add.jsp
index e6bb019..88b380c 100644
--- a/war/WEB-INF/View/Services/add.jsp
+++ b/war/WEB-INF/View/Services/add.jsp
@@ -87,7 +87,7 @@
     <div class="nav-content" style="background-color: #3949a3">
         <ul class="tabs tabs-transparent">
             <li class="tab active"><a class="active" href="../services">Servicios</a></li>
-            <li class="tab"><a href="./users">Otros</a></li>
+            <li class="tab"><a href="../employees">Empleados</a></li>
         </ul>
     </div>
 </nav>
diff --git a/war/WEB-INF/View/Services/index.jsp b/war/WEB-INF/View/Services/index.jsp
index 5203f15..93fbec4 100644
--- a/war/WEB-INF/View/Services/index.jsp
+++ b/war/WEB-INF/View/Services/index.jsp
@@ -91,14 +91,14 @@
     <div class="nav-content" style="background-color: #3949a3">
         <ul class="tabs tabs-transparent">
             <li class="tab active"><a class="active" href="#">Servicios</a></li>
-            <li class="tab"><a href="./users">Otros</a></li>
+            <li class="tab"><a href="./employees">Empleados</a></li>
         </ul>
     </div>
 </nav>
 
 <div class="container">
     <br />
-    <span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Services</span>
+    <span style="font-size: xx-large; font-family: 'Product Sans',Roboto,serif">Servicios</span>
     <br />
     <br />
 
diff --git a/war/WEB-INF/View/Services/view.jsp b/war/WEB-INF/View/Services/view.jsp
index b07e603..1305347 100644
--- a/war/WEB-INF/View/Services/view.jsp
+++ b/war/WEB-INF/View/Services/view.jsp
@@ -89,7 +89,7 @@
     <div class="nav-content" style="background-color: #3949a3">
         <ul class="tabs tabs-transparent">
             <li class="tab active"><a class="active" href="../services">Servicios</a></li>
-            <li class="tab"><a href="./users">Otros</a></li>
+            <li class="tab"><a href="../employees">Empleados</a></li>
         </ul>
     </div>
 </nav>
diff --git a/war/WEB-INF/web.xml b/war/WEB-INF/web.xml
index 4912f9d..92da48f 100644
--- a/war/WEB-INF/web.xml
+++ b/war/WEB-INF/web.xml
@@ -203,6 +203,47 @@
     </servlet-mapping>
 
 
+    <servlet>
+        <servlet-name>EmployeesControllerAdd</servlet-name>
+        <servlet-class>controller.employee.employees.EmployeesControllerAdd</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>EmployeesControllerAdd</servlet-name>
+        <url-pattern>/e/employees/add</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>EmployeesControllerView</servlet-name>
+        <servlet-class>controller.employee.employees.EmployeesControllerView</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>EmployeesControllerView</servlet-name>
+        <url-pattern>/e/employees/view</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>EmployeesControllerDelete</servlet-name>
+        <servlet-class>controller.employee.employees.EmployeesControllerDelete</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>EmployeesControllerDelete</servlet-name>
+        <url-pattern>/e/employees/delete</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>EmployeesControllerIndex</servlet-name>
+        <servlet-class>controller.employee.employees.EmployeesControllerIndex</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>EmployeesControllerIndex</servlet-name>
+        <url-pattern>/e/employees</url-pattern>
+    </servlet-mapping>
+
+
     <!-- Controlador para gestionar el comportamiento del menu de inicio -->
     <servlet>
         <servlet-name>index</servlet-name>
@@ -232,7 +273,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
 
     <servlet>
         <servlet-name>AccessControllerAdd</servlet-name>
-        <servlet-class>controller.employee.access.AccessControllerAdd</servlet-class>
+        <servlet-class>controller.employees.access.AccessControllerAdd</servlet-class>
     </servlet>
     <servlet-mapping>
 		<servlet-name>AccessControllerAdd</servlet-name>