Initial cucumber test fails at the proper place to begin rpsec testing.  Working in basic-article-merge-feature branch to avoid contaminating my 'mainline' branch of legacy-hw2-master.
Adds a minimal rspec test for the merge action on controller, as well as a minimal definition of the merge controller action, to simply redirect.
Completes requirement #2, where article content is merged successfully
Prevent self-merging.
Implements requirement (1), preventing non-admin users from doing merge operations, or from the view even showing the form for the operation.
Adds comment capabilities