Conflicts: .gitignore History.txt Manifest.txt README.rdoc Rakefile bin/annotate lib/annotate.rb lib/annotate/annotate_models.rb lib/annotate_models.rb lib/tasks/annotate.rake lib/tasks/annotate_models.rake lib/tasks/annotate_routes.rake spec/annotate/annotate_models_spec.rb spec/annotate_spec.rb spec/spec.opts spec/spec_helper.rb