elegir regalo
Merge branch 'master' of https://github.com/mchaparro/intercambios

Conflicts:
	intercambios/templates/elegir_regalo.html