added isbn converter gem
rake task for scraping book image, description from amazon
resolving merge conflicts
bundle install
rake tasks for populating book objects with images + descriptions & purchase model
Merge branch 'master' into will/amazon

Conflicts:
	app/models/purchase.rb
	db/schema.rb
annotate
Add header, but not with bootstrap
Removed dry code in Rakefile
Merge branch 'master' into will/amazon

Conflicts:
	Gemfile.lock
removed unnecessary requires from Rakefile
added whenever gem, created cron task for update_books rake task
rake task for updating book info now makes at most 3 attempts for each book
added cart view and controller
Merge branch 'master' of https://github.com/calblueprint/worldreader into work
deleted specs
deleted helpers
added link
=> gone
Merge pull request #54 from calblueprint/eileen/add_cart_view_controller

Added Cart View and Controller