changed Gemfile.locl
Merged conflicts chet