Juhi's Gemfile Edits
Juhi Gemfile Edits
Fixed gemfile conflicts