parseando ...
cambio de nombre
Merge branch 'master' of https://github.com/ewokcillo/vidascontadas

Conflicts:
	vidascontadas/scrap/spiders/base.py
Merge branch 'master' of https://github.com/ewokcillo/vidascontadas

Conflicts:
	vidascontadas/scrap/spiders/base.py