added some user photo files
midway through hiding a sold listing on homepage
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
now a sold listing does not appear on the main listing page
now buttons that display number of buyers in queue for your listing can be clicked and directed to the chatroom
On a profile page, if the listing is sold there is an indicator. One pending cucumber test
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
relist feature written. relist button made, not deleting listing from first buyer's want_listing as stands. test failing
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
added visiting page in one cucumber step
trying to pull
merge conflict confirming_sale_steps resolved
has a working 'relist' and 'next buyer' button on the chatroom, now working on user profile want_listings displays
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
added awesome badges to indicate sold or not
fixed merge conflict and tweaked password heading fields in user profile page update view