added homework 1.1 features
first scenario for merge feature
test submit
mortal user is now a publisher
added psych to Gemfile
added psych to Gemfile
removed hello-work Article as fix for Heroku bug
removed hello-work Article as fix for Heroku bug #2
Merge Articles added to _form partial
Merge Articles passes for admin users
added merge form
added merge form partial
added merge form input name
added merge form input name
added merge form input name
added merge form input name
added route for /admin/content/merge/:id
spec #1 passing
spec #1 passing
spec #1,2,3 passing