made minor changes to db/seeds.rb and working cucumber tests for books_user
made minor changes to db/seeds.rb and working cucumber tests for books_user, and resolved merge conf in db/seeds