added railroady gem
added merge articles cucumber feature
Passing first Cucumber step
features green
handle new article form
handle new article form
New feature step for merge submission
New feature step for merge submission
Added more feature files for merge
New feature scenarios for merge
som econtroller and model specs for merge
Passing first tests on merge_with
Passing more tests on merge_with
Passing test for not admin merge
Test refactoring
Render edit view agfter merge
removed some dead comments
Aricle merge bug fixed