proxy
Merge branch 'master' of https://github.com/yanpeipan/Scrapy

* 'master' of https://github.com/yanpeipan/Scrapy:
  clean log
  clean pyc
  deleted:    Scrapy/proxy.log
  .gitignore
  .gitignore
  deleted:    proxy.log
  douban

Conflicts:
	Scrapy/middlewares.pyc

	new file:   .gitignore
	deleted:    Scrapy/__init__.pyc
	deleted:    Scrapy/items.pyc
	modified:   Scrapy/middlewares.py
	modified:   Scrapy/pipelines.py
	deleted:    Scrapy/pipelines.pyc
	deleted:    Scrapy/proxy.log
	modified:   Scrapy/settings.py
	deleted:    Scrapy/settings.pyc
	deleted:    Scrapy/spiders/__init__.pyc
	modified:   Scrapy/spiders/douban.py
	deleted:    Scrapy/spiders/douban.pyc
	deleted:    Scrapy/spiders/proxy.pyc
	deleted:    Scrapy/spiders/windj007.pyc
	deleted:    proxy.log
proxy