Cucumber scenario for admin working up to the point where models and controllers come into play.  Started work on controller spec and created empty controller method for merge_with
First hw submission
second hw submission for HW 1-1
Oops - forgot to comment out debugger last time.
third hw submission - added conditional to _new.html.erb so that merge would only show if user is an admin
fourth hw submission - making merge available to admins  (Previous commit hid it from everyone)
HW1-2 working on local machine.  Two Cucumber scenarios are not passing.
"Edit Categories" - failing because it can't find a category with specified name
"Merge Articles" (from 1-1) - failing because id in database doesn't match the one designated for test