add changes for heroku
Merge branch 'teimo'
add book detail page
test
Merge branch 'master' into teimo

Conflicts:
	Gemfile.lock
	app/views/book/list.html.erb
	app/views/book/show.html.erb
	config/routes.rb