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
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
outdated gemfile.lock
Merge branch 'will/amazon' of https://github.com/calblueprint/worldreader into will/amazon

* 'will/amazon' of https://github.com/calblueprint/worldreader: (27 commits)
  rake task for updating book info now makes at most 3 attempts for each book
  added whenever gem, created cron task for update_books rake task
  removed unnecessary requires from Rakefile
  Removed dry code in Rakefile
  annotate
  rake tasks for populating book objects with images + descriptions & purchase model
  oops app.js
  Gemfile?
  switch to bootstrap
  annotated models
  added user profile test
  removed launchy line
  added a test for the admin dashboard
  added some support code for user auth for integration tests
  removed really annoying message
  changed description
  removed launchy line
  added supa basic test in a different way
  added really basic test
  added seeds
  ...
resolved merge conflict
Merge branch 'master' into will/amazon

Conflicts:
	db/schema.rb
variables in rake task shouldn't be global
Merge branch 'will/amazon' of github.com:calblueprint/worldreader into will/amazon
Merge pull request #53 from calblueprint/will/amazon

Will/amazon