add
Merge branch 'master' of github.com:caok/books-share

Conflicts:
	spec/models/book_spec.rb
Merge branch 'master' of github.com:caok/books-share
add rspec for reousrce_controller