MOdified gem lock
Add ruby version to gemfile
Add unit tests for merging articles
Update tests for merge article
Implement merge method
Add to merge article tests
Implement comment merge in merge method
Altered merge method to generate a new article

Rather than merging the second article into the first and returning
the first, this change returns a new article that is a combination
of the two sources instead
Change the post merge redirect path
Modify the cucumber tests for merging article
Add paths to support the categories tests
Change new_or_edit method to handle the new categories page
Replace @category setup in new_or_edit with terniary operator