add and generate carrierwave

gem 'carrierwave'
bundle install
rails generate uploader Cover
start carrierwave coding. Currently broken

gem 'carrierwave'
bundle install
rails generate uploader Cover
rails g migration add_cover_to_books cover:string
rake db:migrate
Book  mount_uploader :cover, CoverUploader
make carrierwave work

gem 'rmagick'
sudo apt-get install libmagickwand-dev
http://stackoverflow.com/questions/3894225/imagemagick-rmagick-cant-install-rmagick-2-13-1-cant-find-magick-config
CoverUploader
  thumbs to 180×235
  include CarrierWave::RMagick
book show image_tag
book _form add image file_field and remote_image_url
whitelist file extensions
BooksController params :cover, :remote_cover_url
TODO : test coverage, decide about VC of public/uploads
ignore carrierwave image uploads
Merge branch 'master' into carrierwave

Conflicts:
	app/models/book.rb
	db/schema.rb
schema merge
add test cover and add cover to Factory.book
add note for validating Book.cover presence
refactor controller update methods

pulled up the respond_to stuff into ApplicationController
respond_to_update
respond_to_create
respond_to_destroy
need to be refactored together.
add note in README re rmagick dependency
complete dependencies notes in README
added changes to GemFile for OSX bug
complete merge
updated readme
Merge branch 'nbirnel-carrierwave'
Merge pull request #71 from nbirnel/smell2

refactor controller update methods
fixed README.md
Merge pull request #74 from Mattsface/master

Updated carrier wave branch
improve .gitignore, closing (#75)

remove duplicate .DS_Store line,
ignore .orig files generated by git conflicts
I am just pushing this without review since it is trivial