14--2-14 6:07
Merge branch 'master' of https://github.com/Jai-Prakash-Singh/flipkaart

Conflicts:
	allinone/allinone/spiders/code4_aalinone.py
	allinone/allinone/spiders/code6_allinone.py
	allinone/allinone/spiders/code6_allinone2.py
	allinone/allinone/spiders/code6_allinone2.pyc
	allinone/allinone/spiders/code7_allinone.py
	allinone/allinone/spiders/code7_allinone2.py
	allinone/allinone/spiders/code7_allinone2.pyc
	allinone/allinone/spiders/mydump/code6_allinone2.py
	allinone/allinone/spiders/mydump/code7_allinone2.py
	allinone/allinone/spiders/mydump/code7_allinone3.py
	allinone/allinone/spiders/mydump/code7_allinone4.py
	allinone/allinone/spiders/mydump/code7_allinone5.py
	allinone/allinone/spiders/mydump/code7_allinone6.py
	allinone/allinone/spiders/mytrigger2.py
	allinone/allinone/spiders/newerrorfile.txt
	allinone/allinone/spiders/req_proxy.py
	allinone/allinone/spiders/req_proxy.pyc