user story / features for soft delete
User stories and feature/scenarios draft 2
Merge branch 'master' of https://github.com/elizabrock/nss-squawker
now including the admin feature file as well
user may now delete unwanted squeek
soft-delete is passing all of the scenarios that we spelled out.
Aesthetic changes, including removing commented code (FOR SHAME)
One more change was needed in the 'admin sees...' feature
Merge branch 'master' of https://github.com/elizabrock/nss-squawker

Conflicts:
	app/models/squeek.rb
	app/views/squeeks/_squeek.html.haml
	db/schema.rb
Merge branch 'master' of github.com:jerrysims07/nss-squawker into jerrysims07-master

* 'master' of github.com:jerrysims07/nss-squawker:
  One more change was needed in the 'admin sees...' feature
  Aesthetic changes, including removing commented code (FOR SHAME)
  soft-delete is passing all of the scenarios that we spelled out.
  user may now delete unwanted squeek
  now including the admin feature file as well
  User stories and feature/scenarios draft 2
  user story / features for soft delete

Conflicts:
	config/routes.rb
	features/step_definitions/interaction_steps.rb