lol
Merge branch 'master' of https://github.com/ruben01/SigeretRepositorio

Conflicts:
	SigeretSolucion/Sigeret/Views/Solicitud/Nueva.cshtml