modified:   BeautifulSoup.pyc
	modified:   getGuides.py
	new file:   getGuides.py.save
	new file:   shopping.sql
Merge branch 'master' of https://github.com/mrauer/shopping

Conflicts:
	python/BeautifulSoup.pyc
Merge branch 'master' of https://github.com/mrauer/shopping