Pongo 5
Era 20
Merge branch 'master' of https://github.com/Codiapps/Ofertas

Conflicts:
	ofertas .py

Era 20