ahora canje usa strong parameters
Merge branch 'master' of https://github.com/meruba/sisfa

Conflicts:
	app/controllers/canjes_controller.rb