Added the form fields to the edit page with the check for admin
* input filed had wrong name
implemented first draft of merging feature
only admin can invoke the controller action of merging
- implemented first draft of comment passing
- now text of article is merged
other merge implementation
added save command to comment actrecord
merge is now done in place (no newly created article)
comments seems to be passed around
start work on HW1-2
merged bodies with spaces
cleaned up code
moved deletion of article in the article model