add tishi information
Merge branch 'master' of https://github.com/NickSocial/social