index
Merge remote-tracking branch 'origin' into luis
textos
Merge remote-tracking branch 'origin' into luis
habitaciones
Merge remote-tracking branch 'origin' into luis
Merge remote-tracking branch 'origin' into luis

Conflicts:
	config/locales/es.yml
habitaciones
habitaciones
detalles
favicon
bamboo
detalles
detalles
Agregado jquery valdation
Optimizando reservaciones
delete
Agregado nuevo controlador
Merge branch 'reservaciones'
Merge remote-tracking branch 'origin/luis'

Conflicts:
	app/views/staticpage/habitaciones.html.haml
	app/views/staticpage/index.html.haml
	app/views/staticpage/reservas.html.haml