Fixed map controls
Merge remote-tracking branch 'origin' into categories
Merge remote-tracking branch 'origin' into categories
added categories to events
yelp json passes to view but html view is broken
index yelp results
show yelp logo and link to page