Act regalo
Merge branch 'gh-pages' of https://github.com/camargozzini/06-12-14 into gh-pages

Conflicts:
	_includes/regalos.html