Added logic for displaying edit profile/add/remove friend button on profiles
Merge branch 'master' of github.com:umass-cs-326/team-kiwi-mango