Conflicts: .gitignore Gemfile History.txt Rakefile annotate.gemspec lib/annotate/annotate_models.rb spec/annotate/annotate_models_spec.rb spec/spec_helper.rb todo.txt
