expected to find text...see error in commit message

  1) Manage requirements user adds a new requirement screenshot
     Failure/Error: expect(page).to
have_content('http://www.imgur.com/1.1.1.png')
       expected to find text "http://www.imgur.com/1.1.1.png" in
"Toggle navigation How's it going, Bob Raymond Logout × Requirement was
successfully created. Task list # Requirement Proof Completed? 1.1.1
Attach Screenshot Mark as complete"
     # ./spec/features/manage_requirements_spec.rb:42:in `block (2
levels) in <top (required)>'
Merge remote-tracking branch 'upstream/manage_requirements' into manage_requirements

Conflicts:
	app/controllers/requirements_controller.rb
	app/models/requirement.rb
	app/views/requirements/new.html.erb
	app/views/users/show.html.erb
	spec/features/manage_requirements_spec.rb