Conflicts:
	.gitignore
	Rakefile
	annotate.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake