Changes to gemfile
Merging files