pulling
fixed conflicts
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into eventbrite
can search by event location. can be narrowed down more, and view doesnt really have a home
pulling
fixed conflicts
eventbrite is pulling popular events and linking to media from the venue/1000m radius
pulling
fixed conflict
pulling
fixed conflict
pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into eventbrite
Merge pull request #128 from dbcfoxes2014/eventbrite

Eventbrite