added some user photo files
committing to pull, no real change done
fixing merge conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Fixed merging conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
added visiting page in one cucumber step
trying to pull
merge conflict confirming_sale_steps resolved
Sell it button renamed to Confirm sale
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 swipe gesture for touch devices for listing images carousel
added awesome badges to indicate sold or not
fixed merge issues, need to double check tho
fixed merge conflict and tweaked password heading fields in user profile page update view
deleted duplicate of 'cancel my account' on user update page
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into deleting_dashboard