added email, photos
Merge branch 'master' of https://github.com/stephanieguo/friendswap

w# the commit.

merging master