Habitaciones control design
Conflicts solved

Conflicts:
	losPinos/app/assets/stylesheets/application.css