gemfile
Gemfile
Merge branch 'master' of github.com:kntmrkm/rails4_example
Gemfile conflict