Cambios   pasados
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hotels/Hotels/MVCHotels.csproj
	Hotels/Hotels/Models/Reserva.cs
	Hotels/Hotels/Views/Reserva/Index.cshtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hotels/Hotels/MVCHotels.csproj
	Hotels/Hotels/Models/Reserva.cs
	Hotels/Hotels/Views/Reserva/Index.cshtml