Updated Gemfile
Updated Gemfile.lock
Merge branches 'master' and 'test'