Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	bin/annotate_models
	lib/annotate.rb
	lib/annotate/annotate_routes.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	spec/annotate_models_spec.rb
	spec/spec_helper.rb