phase 1 Social Network project
Merge branch 'master' of https://github.com/20120447/Social-Network