edited profile editor
Merge branch 'master' of https://github.com/stephanieguo/friendswap