fixed user stories for books since title no longer clickable
resolved merge conflicts for .gitignore