botton submit
botton submit
botton submit
botton submit
Merge branch 'master' of github.com:JorgePadilla/Clarion-Hotel

Conflicts:
	.gitignore
	.gitignore~
	app/controllers/reservacion_controller.rb
	app/controllers/reservacion_controller.rb~
	app/views/habitaciones/index.html.erb
	app/views/home/index.html.erb
	app/views/home/index.html.erb~
	app/views/instalacion/index.html.erb
	app/views/reservacion/index.html.erb
	app/views/reservacion/index.html.erb~
	config/routes.rb
	config/routes.rb~
	log/development.log