Added first cucumber scenario
Two features green
Added steps to features, that now pass
Added scenarios and steps
First draft of Article#merge
Merged article should contain the title of one of the source articles
Merged article contains the text of both articles
Merged article contains the text of both articles
Added missing files
All specs running
All cukes passing
Named the merge id input box
Changed merge functionality such that one article gets merged into another and subsequently deleted. Updated RSpecs to reflect this change
Everything is passing
non-admins get 403 when attempting to merge articles
Comments are now merged with articles