Bundle update.
Merge branch 'maglev' of github.com:knub/rails-books-library into maglev

Conflicts:
	Gemfile.lock