changes to books_controller
fix conflicts
fix conflicts
changes for merge
selection panels all the same
unused file removed
Merge branch 'master' of github.com:TomGroombridge/book_project into chris_branch