Updated ruby version
Install new gems
I don't know what the fuck this but it makes my test directory clean
Ignore db blobs
Added merging scenarios and some incomplete suppor
merge article model logic
Article merge method
Controller for merging articles
Views for merge