Yelp data is up and running!
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/data/database.js
Pushing latest marker changes