Update README.md
Update Gemfile
Merge branch 'master' into HEAD

Conflicts:
  Gemfile.lock
Update README.md
Merge Gemfile.lock
Merge commit 'b51e788' into working