changes to database, bug fix
Merge branch 'master' of https://github.com/stephanieguo/friendswap

merge in master