vaciar recepción después de apis
Merge branch 'master' of https://github.com/diegozavala/integracion

Conflicts:
	app/controllers/homes_controller.rb