edited gemfile
Merge branches 'master' and 'taylor'