gitignore
afd

Merge branch 'lopez' of https://github.com/tupini07/HotelCaliforniaExpress into lopez

Conflicts:
	.gitignore
Merge branch 'lopez'
rebase maser lopez
Merge branch 'lopez' of https://github.com/tupini07/HotelCaliforniaExpress into lopez
rebase maser lopez
Merge branch 'lopez' of https://github.com/tupini07/HotelCaliforniaExpress into lopez
agregada interfaz para elegir hotel

Agregada interfaz para elegir hotel antes de pasar a hacer la reserva
cambio sidebar, correccion de links

coreccion de links
merge Andrea
Merge branch 'Andrea'
merge Charle en Mastster
arreglado finalmente el sidebar
merge maria conmaster
merge maria en master
agregar atributo de hotel / reservas

agregar atributo de hotel para reservas
Merge branch 'lopez' of https://github.com/tupini07/HotelCaliforniaExpress into lopez
merge pablo
Arreglando lo que me pidio github
Merge branch 'Charlie' of https://github.com/tupini07/HotelCaliforniaExpress into Charlie

Conflicts:
	nbproject/project.properties
	web/AgregarHotel.jsp
	web/Dashboard.jsp
	web/EditarReservaCliente.jsp
	web/administracionUsuarios.jsp
	web/mantenimientoDeHoteles.jsp
	web/mantenimientoUsuarios.jsp
	web/modificarDatosHotel.jsp
	web/paginaDeHotel.jsp
	web/reservaH.jsp