Yelp API working
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	.gitignore
	ridemix/urls.py