Contestar pregunta
conflictos
mas conflictos
mas conflictos
mas aun
Merge branch 'master' of https://github.com/normandanielmq/ProyectoTest

Conflicts:
	Cliente/appTestCliente/appTestCliente/App_Start/RouteConfig.cs
	Cliente/appTestCliente/appTestCliente/Views/Test/Edit.cshtml