meetup oauth
fixed conflicts
updated gemfile
updated Gemfile