settings
agregue settings al gitignore
Merge branch 'master' of github.com:alexmilano/patchmill

Conflicts:
	patchmill/settings.py
Merge branch 'master' of github.com:alexmilano/patchmill
Agregue modelos para llenar con el scrapy.