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

w# the commit.

merging master
Merge branch 'releaseFeb7Viv'

merging in the photo capability
add views