pry added to Gemfile
Autogenerated modifications for ckeditor/config
Refactored Article#merge_with
Refactor Cucumber step definitions
"the latest artice page" path added to features/support/paths.rb
Feature "Merge Articles" added
Layout changes for article merging
Fix typo in Merge Articles feature
Make sure the merged article is published
Fix permalink_url in Cucumber paths
Implement 'merge' action in Content controller