phase 1-b
Merge branch 'master' of https://github.com/nehal-elsawy/Social-Network-