FUNCIONA PRICING
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3

Conflicts:
	app/helpers/loading_helper.rb
PROBANDO