Starting to add merge functionality.
Try passing merged article through session hash.
Clean up tests by using let
Make merge a class method.
Refactor merge tests.
Handle RecordNotFound exception in merge action.
Test merge action's redirect.
Add article tests and make them pass.
Login credentials for local typo instance
Add scenario for successfully merging articles.
Make merge an instance method and complete the specs.
Fix problems in merge action and specs.

Don't try to store a model in the session.
Return to the edit page after a merge.
Call Article#merge! instead.
Remove newline from expected value.
Update password after db reset.
Merge branch 'hw2'

Conflicts:
	local_login
Update password after db reset.