Merge branch 'master' of https://github.com/ShimritOr37/Friend
Merge branch 'master' of https://github.com/ShimritOr37/Friend