Registro
Merge branch 'master' of https://github.com/fucking007/PrimeraFaseAyD1

Conflicts:
	Tienda/src/main/webapp/Catalogo.jsp