rm conflict
book- incase blank
review form
descriptive urls
Merge branch 'master' of https://github.com/gwenzlau/bklp

Conflicts:
	app/controllers/books_controller.rb
	app/views/books/show.html.erb
fix conflict