Changed some of the steps to make sure the tests only test the test data.
And finished up some of the new step definitions.
And altered the path support for edit pages to support any edit page based on
article id.
moved merge_with out from under the protected keyword so it would be
callable from the object directly
changed my steps to reflect how the app functions.
changed feature steps to reflect behavior.
merge tests not working still though.
got one step passing now. merge seems to be going well
Got all the steps passing, but it might not be accurate because it doesn't check that the previous article
is not there.
Changed the feature steps to check for the article that needs to be gone when it merges.
Something is going wrong with removing the article somehow. I tested the actual app and it seems to
behave correctly. It might have something to do with the published attribute.
merging
Passing merging titles