delete fixed
Merge branch 'master' of https://github.com/StephanMusgrave/ProjectX

Conflicts:
	features/step_definitions/delete_listing_steps.rb
Merge branch 'master' of https://github.com/StephanMusgrave/ProjectX