ridding
Merge branch 'master' of https://github.com/edgarw19/friendapp