edited listings/editing
Merge branch 'master' of https://github.com/stephanieguo/friendswap