PRUEBA
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	config/routes.rb
	db/schema.rb