about to merge
Merge branch 'master' of https://github.com/limderekl/yelpProject

Conflicts:
	testing.py
	yelp.py