added background to feature
added scenario titles
added some scenario steps to non-admin and merge-content
updated views w form for merge articles
got merge page rendering
l-hw2 complete
only admin can merge
comments bug fixed