Merge remote-tracking branch 'origin/master'

Conflicts:
	6.- Resource/Logos(Ai)/LogosCarola/Thumbs.db
	6.- Resource/Logos(Ai)/Thumbs.db
as

sad
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/src/View/ViewAdministrarProductos.java
	4.- Código/AnaIsRepo/src/View/ViewProducto.java
dsa

dsa