Please enter a commit message to explain why this merge is necessary,

Angular

See merge request !5

Merge branch 'main'

See merge request !4

# Conflicts:
#	.gitignore

Master

See merge request !2

# Conflicts:
#   src/main/java/com/stock/dao/InsumoDAO.java
#   src/main/java/com/stock/dao/ProductoTerminadoDAO.java
#   src/main/java/com/stock/dao/UsuarioDAO.java
#   src/main/java/com/stock/dao/UsuarioDAOImpl.java
#   src/main/java/com/stock/model/Compra.java
#   src/main/java/com/stock/model/FamProd.java
#   src/main/java/com/stock/model/Insumo.java
#   src/main/java/com/stock/model/Item.java
#   src/main/java/com/stock/model/MateriaPrima.java
#   src/main/java/com/stock/model/Producto.java
#   src/main/java/com/stock/model/ProductoLimpieza.java
#   src/main/java/com/stock/model/ProductoTerminado.java
#   src/main/java/com/stock/model/Receta.java
#   src/main/java/com/stock/model/Usuario.java
#   src/main/java/com/stock/model/Venta.java
#   src/main/webapp/WEB-INF/web.xml