cambios en la aplicacion
mas cambios en la aplicacion
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/Data/Data.csproj
	code/FrbaHotel.suo
	code/FrbaHotel/Program.cs
	code/Logica/Logica.csproj
	code/Logica/obj/Debug/Logica.csproj.FileListAbsolute.txt
	code/Logica/obj/Debug/Logica.dll
	code/Logica/obj/Debug/Logica.pdb
	code/Logica/obj/Debug/Refactor/Logica.dll
	code/Logica/obj/Debug/ResolveAssemblyReference.cache
	code/Logica/obj/Release/Logica.csproj.FileListAbsolute.txt
	code/Logica/obj/Release/ResolveAssemblyReference.cache