Saving Alejandro's work on yelp
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	ridemix/urls.py