cleared Gemfile
changed Gemfile.lock
merged with master