first commit
Merge branch 'amiller'

Conflicts:
	db/db_development
	db/db_test
merge_stps
passed first cucumber test for feature
Added container for merge_with method, that will do the heavy lifting for
the merge articles feature
Added a few more steps to the cucumber tests. These will test the functionality of the merging of articles.