Added test gemset to Gemfile (Ch 7.7)
Fixed gem group conflicts (Ch 7.7)
Added Gemfile.lock to .gitignore
Merge branch 'master' into transfer