Ollie is entering the chat room
Merge branch 'master' of https://github.com/StephanMusgrave/ProjectX into WantButton
fixed dashboard display feature causing cucumber error
test passing for being the first user to want an item. leads to chat page with seller
feature test written for being the second user to want a listing
wanting second nearly done
merge conflict