updating Gemfile.lock
Merge branch 'deploy'
updating gemfile