modified:   app/controllers/admin/content_controller.rb
	modified:   app/models/article.rb
	new file:   app/views/admin/content/_merge.html.erb
	modified:   app/views/admin/shared/_edit.html.erb
	new file:   features/merge_article.feature
	modified:   features/step_definitions/web_steps.rb
	modified:   spec/controllers/admin/content_controller_spec.rb
	modified:   spec/models/article_spec.rb
	modified:   config/database.yml
	modified:   app/models/article.rb
	modified:   config/database.yml
	modified:   config/database.yml
	modified:   Gemfile
	modified:   config/database.yml
	modified:   app/models/article.rb
	modified:   app/models/article.rb
	modified:   app/models/article.rb
	modified:   app/models/article.rb
	modified:   app/models/article.rb