cdw
Merge branch 'master' of https://github.com/soelgary/PriceParser into cdw

Conflicts:
	ecommerce/parser.py
	grab_prices.py
Merge pull request #6 from soelgary/cdw

cdw