servicios curso
Merge remote-tracking branch 'origin/Wen' into Wen

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
Merge remote-tracking branch 'origin/esteban-lopez' into Wen

Conflicts:
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Properties/AssemblyInfo.cs
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
	BECA2 Web/Web/Web.csproj
listo
Servicio Requisito

Servicio Requisito
Merge remote-tracking branch 'origin/Wen'

Conflicts:
	.gitignore
	BECA2 Web/BECA2.sln
	BECA2 Web/Servicios/Properties/AssemblyInfo.cs
	BECA2 Web/Servicios/Servicios.csproj
	BECA2 Web/Servicios/Web.config
	BECA2 Web/Web/Web.vbproj