thumbnail and content added to books model
Merge branch 'master' of github.com:TomGroombridge/book_project
Fixing bug
changes to books_controller
fix conflicts