with other readers
Merge branch 'master' of https://github.com/gwenzlau/bklp

Conflicts:
	app/views/books/show.html.erb