added instagram event photos
merge conflicting gemfile, events_controller