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

Conflicts:
	features/step_definitions/delete_listing_steps.rb
Dashboard no wants passes
Merge branch 'master' of https://github.com/StephanMusgrave/ProjectX
README
Dashboard I have wants feature passes
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
huge refactoring on dashboard's cucumber web steps. We aren't using 'I', we're using 'ollie' and 'louise' now.
added test for pluralizing dashboard. Changed views for dashboard and now all tests green
changed feature test for want button. introducing chatroom
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'user_profile_page'