bundle install to update gemfile.lock
Merge branch 'master' into testing
Merge pull request #6 from nealcpeters/testing

Testing