mostly working, except for successful merge case, merge button, can't find article without an ID
close to working... just need to fix up routes
good working repo for HW2, still could use a couple more tests
the remainder of changes
the remainder of changes II
looking good... except for all of the failing specs
fixes to prevent non-admin from merging or even seeing merge button
improved merge for comments of articles, improved tests so that they pass.