Eliminados comentarios
Merge remote-tracking branch 'origin/master'

Conflicts:
	ofertas .py