add gems rspec-rails and pg to Gemfile
run bundle install to update Gemlock file with new dependencies for pg and rspec-rails
add capybara gem, run bundle install, update gemfile.lock, edit pages_controller.rb
gem g rspec:install and rails generate integration_test pages
add config info for capybara in spec_helper.rb, add test for about and help pages to pages_spec.rb, add routes for about and help to routes, and modify view files for page.html.erb and help.html.erb
add test for pages/home
create and author view page for pages/home, add route for pages/home, update pages_controller to include home action
generate bookshelf, reader, review models; generate readers_controller, rakedb:migrate create_reader, create_bookshelves, create_reviews
fix merge conflicts